printk/nmi: generic solution for safe printk in NMI

[mirror_ubuntu-artful-kernel.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 0dfd09d54c6519fb8a5069bf6153f4245184d01f..bccc1d607be540ebb44fe494446039ceffd6f577 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1454,6 +1454,11 @@ config PRINTK
          very difficult to diagnose system problems, saying N here is
          strongly discouraged.
 
+config PRINTK_NMI
+       def_bool y
+       depends on PRINTK
+       depends on HAVE_NMI
+
 config BUG
        bool "BUG() support" if EXPERT
        default y
@@ -1742,6 +1747,15 @@ config SLOB
 
 endchoice
 
+config SLAB_FREELIST_RANDOM
+       default n
+       depends on SLAB
+       bool "SLAB freelist randomization"
+       help
+         Randomizes the freelist order used on creating new SLABs. This
+         security feature reduces the predictability of the kernel slab
+         allocator against heap overflows.
+
 config SLUB_CPU_PARTIAL
        default y
        depends on SLUB && SMP