diff options
| author | Kees Cook | 2014-06-13 22:30:36 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki | 2014-06-16 23:30:44 +0200 |
| commit | 24f2e0273f80ec262a772059e140a0adef35296d (patch) | |
| tree | abc4fadb0de6845ed9c4b88918f14b54e5d213c5 /arch/x86/Kconfig | |
| parent | PM / hibernate: introduce "nohibernate" boot parameter (diff) | |
| download | kernel-qcow2-linux-24f2e0273f80ec262a772059e140a0adef35296d.tar.gz kernel-qcow2-linux-24f2e0273f80ec262a772059e140a0adef35296d.tar.xz kernel-qcow2-linux-24f2e0273f80ec262a772059e140a0adef35296d.zip | |
x86, kaslr: boot-time selectable with hibernation
Changes kASLR from being compile-time selectable (blocked by
CONFIG_HIBERNATION), to being boot-time selectable (with hibernation
available by default) via the "kaslr" kernel command line.
Signed-off-by: Kees Cook <keescook@chromium.org>
Acked-by: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index fcefdda5136d..a8f749ef0fdc 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -1672,7 +1672,6 @@ config RELOCATABLE config RANDOMIZE_BASE bool "Randomize the address of the kernel image" depends on RELOCATABLE - depends on !HIBERNATION default n ---help--- Randomizes the physical and virtual address at which the |