diff options
author | David Daney <ddaney.cavm@gmail.com> | 2012-01-10 18:10:21 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-01-10 19:30:51 -0500 |
commit | e39f560239984c3098237ad94c9449b1494163f8 (patch) | |
tree | c86d9f84a3cb706813919ec7472fb75207bc9c8c /arch | |
parent | 5742332dea5560d6c449b007d9539dbdc8ee531b (diff) |
fs: binfmt_elf: create Kconfig variable for PIE randomization
Randomization of PIE load address is hard coded in binfmt_elf.c for X86
and ARM. Create a new Kconfig variable
(CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE) for this and use it instead. Thus
architecture specific policy is pushed out of the generic binfmt_elf.c and
into the architecture Kconfig files.
X86 and ARM Kconfigs are modified to select the new variable so there is
no change in behavior. A follow on patch will select it for MIPS too.
Signed-off-by: David Daney <david.daney@cavium.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Alexander Viro <viro@zeniv.linux.org.uk>
Acked-by: H. Peter Anvin <hpa@zytor.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/Kconfig | 1 | ||||
-rw-r--r-- | arch/x86/Kconfig | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9d66dfc33a5a..98a6459cd398 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig | |||
@@ -16,6 +16,7 @@ config ARM | |||
16 | select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL) | 16 | select HAVE_FTRACE_MCOUNT_RECORD if (!XIP_KERNEL) |
17 | select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL) | 17 | select HAVE_DYNAMIC_FTRACE if (!XIP_KERNEL) |
18 | select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL) | 18 | select HAVE_FUNCTION_GRAPH_TRACER if (!THUMB2_KERNEL) |
19 | select ARCH_BINFMT_ELF_RANDOMIZE_PIE | ||
19 | select HAVE_GENERIC_DMA_COHERENT | 20 | select HAVE_GENERIC_DMA_COHERENT |
20 | select HAVE_KERNEL_GZIP | 21 | select HAVE_KERNEL_GZIP |
21 | select HAVE_KERNEL_LZO | 22 | select HAVE_KERNEL_LZO |
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 1d2a69dd36d8..d6ddc0bfe36a 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -62,6 +62,7 @@ config X86 | |||
62 | select ANON_INODES | 62 | select ANON_INODES |
63 | select HAVE_ARCH_KMEMCHECK | 63 | select HAVE_ARCH_KMEMCHECK |
64 | select HAVE_USER_RETURN_NOTIFIER | 64 | select HAVE_USER_RETURN_NOTIFIER |
65 | select ARCH_BINFMT_ELF_RANDOMIZE_PIE | ||
65 | select HAVE_ARCH_JUMP_LABEL | 66 | select HAVE_ARCH_JUMP_LABEL |
66 | select HAVE_TEXT_POKE_SMP | 67 | select HAVE_TEXT_POKE_SMP |
67 | select HAVE_GENERIC_HARDIRQS | 68 | select HAVE_GENERIC_HARDIRQS |