diff options
author | Michael Ellerman <mpe@ellerman.id.au> | 2019-11-14 19:19:20 +1100 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2019-11-14 19:23:33 +1100 |
commit | 3df191118b4ca20f58c7a84e59330c6b9d99454b (patch) | |
tree | dc99c81363f288f00d30fd4f63489dc28df7fef6 /arch/powerpc/Kconfig | |
parent | 565f9bc05e2dad6c7fdfc7c2e641be580aa599cd (diff) | |
parent | c2d1a13520eee7f0ac64ffb94f8756006320e4b8 (diff) | |
download | linux-stable-3df191118b4ca20f58c7a84e59330c6b9d99454b.tar.gz linux-stable-3df191118b4ca20f58c7a84e59330c6b9d99454b.tar.bz2 linux-stable-3df191118b4ca20f58c7a84e59330c6b9d99454b.zip |
Merge branch 'topic/kaslr-book3e32' into next
This is a slight rebase of Scott's next branch, which contained the
KASLR support for book3e 32-bit, to squash in a couple of small fixes.
See the original pull request:
https://lore.kernel.org/r/20191022232155.GA26174@home.buserror.net
Diffstat (limited to 'arch/powerpc/Kconfig')
-rw-r--r-- | arch/powerpc/Kconfig | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig index b0bdfe31d12e..09dddb849671 100644 --- a/arch/powerpc/Kconfig +++ b/arch/powerpc/Kconfig @@ -551,6 +551,17 @@ config RELOCATABLE setting can still be useful to bootwrappers that need to know the load address of the kernel (eg. u-boot/mkimage). +config RANDOMIZE_BASE + bool "Randomize the address of the kernel image" + depends on (FSL_BOOKE && FLATMEM && PPC32) + depends on RELOCATABLE + help + Randomizes the virtual address at which the kernel image is + loaded, as a security feature that deters exploit attempts + relying on knowledge of the location of kernel internals. + + If unsure, say Y. + config RELOCATABLE_TEST bool "Test relocatable kernel" depends on (PPC64 && RELOCATABLE) |