Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-16 01:38:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

efi_loader: Trim output buffer size correctly for tee variables

Browse source 
The current code does not trim the output buffer correctly.
In fact it doesn't trim the buffer at all, since it calculates a wrong
value for it, which isn't even applied.
So let's remove the unused temporary size variable and trim the buffer
correctly.
Since we are editing efi_get_next_variable_name_int(), fix an indentation
error along the way.

Fixes: f042e47e8f ("efi_loader: Implement EFI variable handling via OP-TEE")
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>

Remove superfluous conversion to (u8 *) for memcpy argument.
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Ilias Apalodimas 2020-07-22 01:50:37 +03:00 committed by Heinrich Schuchardt
parent a2d051e7b6
commit db94dfbd52
1 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
lib/efi_loader/efi_variable_tee.c
View file

@ -410,7 +410,6 @@ efi_status_t efi_get_next_variable_name_int(efi_uintn_t *variable_name_size,
efi_uintn_t payload_size; efi_uintn_t payload_size;
efi_uintn_t out_name_size; efi_uintn_t out_name_size;
efi_uintn_t in_name_size; efi_uintn_t in_name_size;
efi_uintn_t tmp_dsize;
u8 *comm_buf = NULL; u8 *comm_buf = NULL;
efi_status_t ret; efi_status_t ret;
@ -433,13 +432,8 @@ efi_status_t efi_get_next_variable_name_int(efi_uintn_t *variable_name_size,
} }
/* Trim output buffer size */ /* Trim output buffer size */
tmp_dsize = *variable_name_size; if (out_name_size > max_payload_size - MM_VARIABLE_GET_NEXT_HEADER_SIZE)
if (in_name_size + tmp_dsize > out_name_size = max_payload_size - MM_VARIABLE_GET_NEXT_HEADER_SIZE;
max_payload_size - MM_VARIABLE_GET_NEXT_HEADER_SIZE) {
tmp_dsize = max_payload_size -
MM_VARIABLE_GET_NEXT_HEADER_SIZE -
in_name_size;
}
payload_size = MM_VARIABLE_GET_NEXT_HEADER_SIZE + out_name_size; payload_size = MM_VARIABLE_GET_NEXT_HEADER_SIZE + out_name_size;
comm_buf = setup_mm_hdr((void **)&var_getnext, payload_size, comm_buf = setup_mm_hdr((void **)&var_getnext, payload_size,
@ -465,8 +459,7 @@ efi_status_t efi_get_next_variable_name_int(efi_uintn_t *variable_name_size,
goto out; goto out;
guidcpy(guid, &var_getnext->guid); guidcpy(guid, &var_getnext->guid);
memcpy(variable_name, (u8 *)var_getnext->name, memcpy(variable_name, var_getnext->name, var_getnext->name_size);
var_getnext->name_size);
out: out:
free(comm_buf); free(comm_buf);