leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

efi_loader: fix bug in efi_get_memory_map

Browse Source 
When booting shim -> fallback -> shim -> grub -> linux the memory map is
a bit larger than the size linux passes in on the first call.  But in
the EFI_BUFFER_TOO_SMALL case we were not passing back the updated size
to linux so it would loop forever.

Signed-off-by: Rob Clark <robdclark@gmail.com>
Signed-off-by: Alexander Graf <agraf@suse.de>
This commit is contained in:
Rob Clark 2017-07-26 14:34:05 -04:00 committed by Alexander Graf
parent f4f9993f7e
commit a1b24823b6
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/efi_loader/efi_memory.c
View File

@ -407,11 +407,11 @@ efi_status_t efi_get_memory_map(unsigned long *memory_map_size,
map_size = map_entries * sizeof(struct efi_mem_desc); map_size = map_entries * sizeof(struct efi_mem_desc);
*memory_map_size = map_size;
if (provided_map_size < map_size) if (provided_map_size < map_size)
return EFI_BUFFER_TOO_SMALL; return EFI_BUFFER_TOO_SMALL;
*memory_map_size = map_size;
if (descriptor_size) if (descriptor_size)
*descriptor_size = sizeof(struct efi_mem_desc); *descriptor_size = sizeof(struct efi_mem_desc);