mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-09-21 15:12:04 +00:00
efi_loader: parameter check in GetNextVariableName()
If GetNextVariableName() is called with a non-existing combination of VariableName and VendorGuid, return EFI_INVALID_PARAMETER. If GetNextVariableName() is called with a string that is not zero terminated, return EFI_INVALID_PARAMETER. Reformat a line over 80 characters. Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
parent
9aeb380277
commit
7e5875a856
1 changed files with 8 additions and 3 deletions
|
@ -304,8 +304,8 @@ efi_get_variable_mem(u16 *variable_name, const efi_guid_t *vendor, u32 *attribut
|
||||||
}
|
}
|
||||||
|
|
||||||
efi_status_t __efi_runtime
|
efi_status_t __efi_runtime
|
||||||
efi_get_next_variable_name_mem(efi_uintn_t *variable_name_size, u16 *variable_name,
|
efi_get_next_variable_name_mem(efi_uintn_t *variable_name_size,
|
||||||
efi_guid_t *vendor)
|
u16 *variable_name, efi_guid_t *vendor)
|
||||||
{
|
{
|
||||||
struct efi_var_entry *var;
|
struct efi_var_entry *var;
|
||||||
efi_uintn_t old_size;
|
efi_uintn_t old_size;
|
||||||
|
@ -314,7 +314,12 @@ efi_get_next_variable_name_mem(efi_uintn_t *variable_name_size, u16 *variable_na
|
||||||
if (!variable_name_size || !variable_name || !vendor)
|
if (!variable_name_size || !variable_name || !vendor)
|
||||||
return EFI_INVALID_PARAMETER;
|
return EFI_INVALID_PARAMETER;
|
||||||
|
|
||||||
efi_var_mem_find(vendor, variable_name, &var);
|
if (u16_strnlen(variable_name, *variable_name_size) ==
|
||||||
|
*variable_name_size)
|
||||||
|
return EFI_INVALID_PARAMETER;
|
||||||
|
|
||||||
|
if (!efi_var_mem_find(vendor, variable_name, &var) && *variable_name)
|
||||||
|
return EFI_INVALID_PARAMETER;
|
||||||
|
|
||||||
if (!var)
|
if (!var)
|
||||||
return EFI_NOT_FOUND;
|
return EFI_NOT_FOUND;
|
||||||
|
|
Loading…
Reference in a new issue