EFI fixes
Linus,
Please pull the latest core-urgent-for-linus git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git core-urgent-for-linus
# HEAD: 0ce3cc008ec04258b6a6314b09f1a6012810881a arm64/efi: Fix boot crash by not padding between EFI_MEMORY_RUNTIME regions
Two EFI fixes: one for x86, one for ARM, fixing a boot crash bug that can trigger under newer EFI firmware.
Thanks,
Ingo
------------------>
Ard Biesheuvel (1):
arm64/efi: Fix boot crash by not padding between EFI_MEMORY_RUNTIME regions
Matt Fleming (1):
x86/efi: Fix boot crash by mapping EFI memmap entries bottom-up at runtime, instead of top-down
arch/arm64/kernel/efi.c | 3 +- arch/x86/platform/efi/efi.c | 67 ++++++++++++++++++++++++- drivers/firmware/efi/libstub/arm-stub.c | 88 +++++++++++++++++++++++++++------ 3 files changed, 141 insertions(+), 17 deletions(-)
arch/arm64/kernel/efi.c +2 -1
@@ -258,7 +258,8 @@ static bool __init efi_virtmap_init(void)*/ if (!is_normal_ram (md)) prot =__pgprot (PROT_DEVICE_nGnRE); -else if (md->type ==EFI_RUNTIME_SERVICES_CODE ) +else if (md->type ==EFI_RUNTIME_SERVICES_CODE || + !PAGE_ALIGNED (md->phys_addr)) prot =PAGE_KERNEL_EXEC ;else prot =PAGE_KERNEL ;
arch/x86/platform/efi/efi.c +66 -1
79 lines not on this page · raw message
drivers/firmware/efi/libstub/arm-stub.c +73 -15
118 lines not on this page · raw message