Merge tag 'staging-4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh...

[deliverable/linux.git] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index df28f2b6f3e1b47ab9a290c02f74b2da5f703196..da10d9b573a4a809f6159d82660a717f224903ec 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -136,6 +136,7 @@ config HAVE_ARCH_HARDENED_USERCOPY
 config HARDENED_USERCOPY
        bool "Harden memory copies between kernel and userspace"
        depends on HAVE_ARCH_HARDENED_USERCOPY
 config HARDENED_USERCOPY
        bool "Harden memory copies between kernel and userspace"
        depends on HAVE_ARCH_HARDENED_USERCOPY

+       depends on HAVE_HARDENED_USERCOPY_ALLOCATOR

        select BUG
        help
          This option checks for obviously wrong memory regions when
        select BUG
        help
          This option checks for obviously wrong memory regions when