efi_loader: fix bug in efi_get_memory_map

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>

diff --git a/lib/efi_loader/efi_memory.c b/lib/efi_loader/efi_memory.c
index f59e3ea32788880eebf3059d306587b00a062681..9e079f1fa3a66cc301cd1bf039b7896f97f473f4 100644 (file)
--- a/lib/efi_loader/efi_memory.c
+++ b/lib/efi_loader/efi_memory.c
@@ -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);
 
+       *memory_map_size = map_size;
+
        if (provided_map_size < map_size)
                return EFI_BUFFER_TOO_SMALL;
 
-       *memory_map_size = map_size;
-
        if (descriptor_size)
                *descriptor_size = sizeof(struct efi_mem_desc);