Merge tag 'efi-urgent' into x86/efi
* Enforce CONFIG_RELOCATABLE for the x86 EFI boot stub, otherwise
it's possible to overwrite random pieces of unallocated memory during
kernel decompression, leading to machine resets.
Resolved Conflicts:
arch/x86/Kconfig
Signed-off-by:
H. Peter Anvin <hpa@linux.intel.com>
Showing
- arch/x86/Kconfig 1 addition, 0 deletionsarch/x86/Kconfig
- arch/x86/boot/header.S 22 additions, 4 deletionsarch/x86/boot/header.S
- arch/x86/boot/tools/build.c 30 additions, 8 deletionsarch/x86/boot/tools/build.c
- drivers/firmware/efi/efi-pstore.c 1 addition, 1 deletiondrivers/firmware/efi/efi-pstore.c
- drivers/firmware/efi/efi.c 18 additions, 10 deletionsdrivers/firmware/efi/efi.c
- drivers/firmware/efi/libstub/fdt.c 1 addition, 1 deletiondrivers/firmware/efi/libstub/fdt.c
Please register or sign in to comment