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>

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index dcbec34154cf99ad24e840d4246a2a5037771c18..83d8392c13340a9d7412a63ecc9a4d7be0ba9293 100644 (file)
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -1142,7 +1142,7 @@ config SECCOMP
 
 config CC_STACKPROTECTOR
        bool "Enable -fstack-protector buffer overflow detection (EXPERIMENTAL)"
-       depends on X86_64 && EXPERIMENTAL && BROKEN
+       depends on X86_64
        help
          This option turns on the -fstack-protector GCC feature. This
          feature puts, at the beginning of critical functions, a canary
@@ -1159,6 +1159,7 @@ config CC_STACKPROTECTOR
 config CC_STACKPROTECTOR_ALL
        bool "Use stack-protector for all functions"
        depends on CC_STACKPROTECTOR
+       default y
        help
          Normally, GCC only inserts the canary value protection for
          functions that use large-ish on-stack buffers. By enabling

diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index ac1e31ba4795cb0f067a280826da257432f93f33..b5c5b55d043711e2a33f0682745822d612bf2935 100644 (file)
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -102,6 +102,7 @@ config DIRECT_GBPAGES
 config DEBUG_RODATA_TEST
        bool "Testcase for the DEBUG_RODATA feature"
        depends on DEBUG_RODATA
+       default y
        help
          This option enables a testcase for the DEBUG_RODATA
          feature as well as for the change_page_attr() infrastructure.