GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-19 21:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

efi_loader: check parameters of GetMemoryMap

Browse source 
Check the parameters of boottime service GetMemoryMap().
Return EFI_INVALID_PARAMETER where required by the UEFI spec.

Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Heinrich Schuchardt 2018-07-02 12:53:54 +02:00 • committed by Alexander Graf
parent 4d5e071ee0
commit 8e835554b3
1 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
lib/efi_loader/efi_memory.c
View file

@ -453,6 +453,9 @@ efi_status_t efi_get_memory_map(efi_uintn_t *memory_map_size,
struct list_head *lhandle; struct list_head *lhandle;
efi_uintn_t provided_map_size = *memory_map_size; efi_uintn_t provided_map_size = *memory_map_size;
if (!memory_map_size)
return EFI_INVALID_PARAMETER;
list_for_each(lhandle, &efi_mem) list_for_each(lhandle, &efi_mem)
map_entries++; map_entries++;
@ -463,6 +466,9 @@ efi_status_t efi_get_memory_map(efi_uintn_t *memory_map_size,
if (provided_map_size < map_size) if (provided_map_size < map_size)
return EFI_BUFFER_TOO_SMALL; return EFI_BUFFER_TOO_SMALL;
if (!memory_map)
return EFI_INVALID_PARAMETER;
if (descriptor_size) if (descriptor_size)
*descriptor_size = sizeof(struct efi_mem_desc); *descriptor_size = sizeof(struct efi_mem_desc);
@ -470,19 +476,18 @@ efi_status_t efi_get_memory_map(efi_uintn_t *memory_map_size,
*descriptor_version = EFI_MEMORY_DESCRIPTOR_VERSION; *descriptor_version = EFI_MEMORY_DESCRIPTOR_VERSION;
/* Copy list into array */ /* Copy list into array */
if (memory_map) { /* Return the list in ascending order */
/* Return the list in ascending order */ memory_map = &memory_map[map_entries - 1];
memory_map = &memory_map[map_entries - 1]; list_for_each(lhandle, &efi_mem) {
list_for_each(lhandle, &efi_mem) { struct efi_mem_list *lmem;
struct efi_mem_list *lmem;
lmem = list_entry(lhandle, struct efi_mem_list, link); lmem = list_entry(lhandle, struct efi_mem_list, link);
*memory_map = lmem->desc; *memory_map = lmem->desc;
memory_map--; memory_map--;
}
} }
*map_key = 0; if (map_key)
*map_key = 0;
return EFI_SUCCESS; return EFI_SUCCESS;
} }