diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-02-13 10:15:34 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-26 10:15:32 -0400 |
commit | 72370f2a5b227bd3817593a6b15ea3f53f51dfcb (patch) | |
tree | ed11ab4fd3f5770ff4513194e0c647cd909aced4 /arch/x86/Kconfig | |
parent | 5cb273013e182a35e7db614d3e20a144cba71e53 (diff) |
x86: if stackprotector is enabled, thn use stack-protector-all by default
also enable the rodata and nx tests.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/Kconfig')
-rw-r--r-- | arch/x86/Kconfig | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index dcbec34154cf..83d8392c1334 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig | |||
@@ -1142,7 +1142,7 @@ config SECCOMP | |||
1142 | 1142 | ||
1143 | config CC_STACKPROTECTOR | 1143 | config CC_STACKPROTECTOR |
1144 | bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" | 1144 | bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)" |
1145 | depends on X86_64 && EXPERIMENTAL && BROKEN | 1145 | depends on X86_64 |
1146 | help | 1146 | help |
1147 | This option turns on the -fstack-protector GCC feature. This | 1147 | This option turns on the -fstack-protector GCC feature. This |
1148 | feature puts, at the beginning of critical functions, a canary | 1148 | feature puts, at the beginning of critical functions, a canary |
@@ -1159,6 +1159,7 @@ config CC_STACKPROTECTOR | |||
1159 | config CC_STACKPROTECTOR_ALL | 1159 | config CC_STACKPROTECTOR_ALL |
1160 | bool "Use stack-protector for all functions" | 1160 | bool "Use stack-protector for all functions" |
1161 | depends on CC_STACKPROTECTOR | 1161 | depends on CC_STACKPROTECTOR |
1162 | default y | ||
1162 | help | 1163 | help |
1163 | Normally, GCC only inserts the canary value protection for | 1164 | Normally, GCC only inserts the canary value protection for |
1164 | functions that use large-ish on-stack buffers. By enabling | 1165 | functions that use large-ish on-stack buffers. By enabling |