diff options
| author | Tom Rini <trini@konsulko.com> | 2022-12-20 12:50:38 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-12-20 12:50:48 -0500 |
| commit | 1154e965d0bd16cf438afdaa4118e1455fd71a44 (patch) | |
| tree | 9d862e44a520ea50e1cb8b15fd1ffd5675c5a018 /lib/efi_loader/efi_var_mem.c | |
| parent | 566bc672a7474f4bf67b29514121ed41db21ed71 (diff) | |
| parent | ad50ca5019ae2b4f6ad5ffb4d62808b640f7b8aa (diff) | |
Merge tag 'efi-2023-01-rc5' of https://source.denx.de/u-boot/custodians/u-boot-efi
Pull request for efi-2023-01-rc5
UEFI:
* Improve parameter checking in efi_get_next_variable_name_mem()
* Fix a bugs in management of security database via the eficonfig command
Other:
* Allow sound command to play multiple sounds
Diffstat (limited to 'lib/efi_loader/efi_var_mem.c')
| -rw-r--r-- | lib/efi_loader/efi_var_mem.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/efi_loader/efi_var_mem.c b/lib/efi_loader/efi_var_mem.c index 13909b1d26..0bac594e00 100644 --- a/lib/efi_loader/efi_var_mem.c +++ b/lib/efi_loader/efi_var_mem.c @@ -315,14 +315,14 @@ efi_get_next_variable_name_mem(efi_uintn_t *variable_name_size, u16 *variable_name, efi_guid_t *vendor) { struct efi_var_entry *var; - efi_uintn_t old_size; + efi_uintn_t len, old_size; u16 *pdata; if (!variable_name_size || !variable_name || !vendor) return EFI_INVALID_PARAMETER; - if (u16_strnlen(variable_name, *variable_name_size) == - *variable_name_size) + len = *variable_name_size >> 1; + if (u16_strnlen(variable_name, len) == len) return EFI_INVALID_PARAMETER; if (!efi_var_mem_find(vendor, variable_name, &var) && *variable_name) |