Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-13 08:27:23 +00:00
Code Issues Projects Releases Packages Wiki Activity

efi_loader: cleanup for tee backed variables

Browse source 
There's 2 variables in efi_get_next_variable_name() checking the size of
the variable name. Let's get rid of the reduntant definition and
simplitfy the code a bit.

Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Ilias Apalodimas 2020-07-01 16:41:25 +03:00 committed by Heinrich Schuchardt
parent 491bfe8606
commit ecb833a0c6
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/efi_loader/efi_variable_tee.c
View file

@ -351,7 +351,6 @@ efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_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; efi_uintn_t tmp_dsize;
efi_uintn_t name_size;
u8 *comm_buf = NULL; u8 *comm_buf = NULL;
efi_status_t ret; efi_status_t ret;
@ -370,19 +369,18 @@ efi_status_t EFIAPI efi_get_next_variable_name(efi_uintn_t *variable_name_size,
goto out; goto out;
} }
name_size = u16_strsize(variable_name); if (in_name_size > max_payload_size - MM_VARIABLE_GET_NEXT_HEADER_SIZE) {
if (name_size > max_payload_size - MM_VARIABLE_GET_NEXT_HEADER_SIZE) {
ret = EFI_INVALID_PARAMETER; ret = EFI_INVALID_PARAMETER;
goto out; goto out;
} }
/* Trim output buffer size */ /* Trim output buffer size */
tmp_dsize = *variable_name_size; tmp_dsize = *variable_name_size;
if (name_size + tmp_dsize > if (in_name_size + tmp_dsize >
max_payload_size - MM_VARIABLE_GET_NEXT_HEADER_SIZE) { max_payload_size - MM_VARIABLE_GET_NEXT_HEADER_SIZE) {
tmp_dsize = max_payload_size - tmp_dsize = max_payload_size -
MM_VARIABLE_GET_NEXT_HEADER_SIZE - MM_VARIABLE_GET_NEXT_HEADER_SIZE -
name_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;