aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-11-06 12:12:41 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2015-11-06 12:12:41 -0500
commit54727e6e950aacd14ec9cd4260e9fe498322828c (patch)
treed51fc620d8337c919b870f68fa8a7144d08600df
parentd1e41ff11941784f469f17795a4d9425c2eb4b7a (diff)
x86: don't make DEBUG_WX default to 'y' even with DEBUG_RODATA
It turns out that we still have issues with the EFI memory map that ends up polluting our kernel page tables with writable executable pages. That will get sorted out, but in the meantime let's not make the scary complaint about them be on by default. The code is useful for developers, but not ready for end user testing yet. Acked-by: Borislav Petkov <bp@alien8.de> Acked-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/x86/Kconfig.debug1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/Kconfig.debug b/arch/x86/Kconfig.debug
index 3e0baf726eef..137dfa96aa14 100644
--- a/arch/x86/Kconfig.debug
+++ b/arch/x86/Kconfig.debug
@@ -113,7 +113,6 @@ config DEBUG_RODATA_TEST
113config DEBUG_WX 113config DEBUG_WX
114 bool "Warn on W+X mappings at boot" 114 bool "Warn on W+X mappings at boot"
115 depends on DEBUG_RODATA 115 depends on DEBUG_RODATA
116 default y
117 select X86_PTDUMP_CORE 116 select X86_PTDUMP_CORE
118 ---help--- 117 ---help---
119 Generate a warning if any W+X mappings are found at boot. 118 Generate a warning if any W+X mappings are found at boot.