Merge tag 'drm-misc-fixes-2017-09-28-1' of git://anongit.freedesktop.org/git/drm...

[linux.git] / init / Kconfig

diff --git a/init/Kconfig b/init/Kconfig
index 8514b25db21c6bb6928a6944cc6867ae9414321c..78cb2461012ef530f2755a0a6a8458428ed19043 100644 (file)
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -1275,12 +1275,17 @@ config BASE_FULL
 config FUTEX
        bool "Enable futex support" if EXPERT
        default y
-       select RT_MUTEXES
+       imply RT_MUTEXES
        help
          Disabling this option will cause the kernel to be built without
          support for "fast userspace mutexes".  The resulting kernel may not
          run glibc-based applications correctly.
 
+config FUTEX_PI
+       bool
+       depends on FUTEX && RT_MUTEXES
+       default y
+
 config HAVE_FUTEX_CMPXCHG
        bool
        depends on FUTEX
@@ -1571,6 +1576,15 @@ config SLAB_FREELIST_RANDOM
          security feature reduces the predictability of the kernel slab
          allocator against heap overflows.
 
+config SLAB_FREELIST_HARDENED
+       bool "Harden slab freelist metadata"
+       depends on SLUB
+       help
+         Many kernel heap attacks try to target slab cache metadata and
+         other infrastructure. This options makes minor performance
+         sacrifies to harden the kernel slab allocator against common
+         freelist exploit methods.
+
 config SLUB_CPU_PARTIAL
        default y
        depends on SLUB && SMP