diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-08-11 13:58:54 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-08-11 13:58:54 -0700 |
| commit | 9e13bcf7e0981f1db0c8c8255ac17d5f898903e9 (patch) | |
| tree | 2bb16d5bceab26b92ea68c2b895ce4a353d9338a /arch/x86/Kconfig | |
| parent | b16d8c231e4d03fefc7de1b8b62bad5659ee8070 (diff) | |
| parent | 7b2a583afb4ab894f78bc0f8bd136e96b6499a7e (diff) | |
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>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 7ea8aaaab7fc..842a5abf3aed 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1537,6 +1537,7 @@ config EFI config EFI_STUB bool "EFI stub support" depends on EFI && !X86_USE_3DNOW + select RELOCATABLE ---help--- This kernel feature allows a bzImage to be loaded directly by EFI firmware without the use of a bootloader. |