path: root/arch
diff options
authorArd Biesheuvel <>2020-02-02 00:33:04 +0100
committerIngo Molnar <>2020-02-02 10:25:43 +0100
commit59365cadfbcd299b8cdbe0c165faf15767c5f166 (patch)
tree280d1924c791d1dca15902f8a0125b522df453a4 /arch
parentb3a6082223369203d7e7db7e81253ac761377644 (diff)
efi/x86: Fix boot regression on systems with invalid memmap entries
In efi_clean_memmap(), we do a pass over the EFI memory map to remove bogus entries that may be returned on certain systems. This recent commit: 1db91035d01aa8bf ("efi: Add tracking for dynamically allocated memmaps") refactored this code to pass the input to efi_memmap_install() via a temporary struct on the stack, which is populated using an initializer which inadvertently defines the value of its size field in terms of its desc_size field, which value cannot be relied upon yet in the initializer itself. Fix this by using efi.memmap.desc_size instead, which is where we get the value for desc_size from in the first place. Reported-by: Jörg Otte <> Tested-by: Jörg Otte <> Tested-by: Dan Williams <> Signed-off-by: Ard Biesheuvel <> Signed-off-by: Ingo Molnar <> Cc: Cc: Cc: Cc: Link:
Diffstat (limited to 'arch')
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
index 59f7f6d60cf6..ae923ee8e2b4 100644
--- a/arch/x86/platform/efi/efi.c
+++ b/arch/x86/platform/efi/efi.c
@@ -308,7 +308,7 @@ static void __init efi_clean_memmap(void)
.phys_map = efi.memmap.phys_map,
.desc_version = efi.memmap.desc_version,
.desc_size = efi.memmap.desc_size,
- .size = data.desc_size * (efi.memmap.nr_map - n_removal),
+ .size = efi.memmap.desc_size * (efi.memmap.nr_map - n_removal),
.flags = 0,