Merge tag 'nfsd-4.12' of git://linux-nfs.org/~bfields/linux

[karo-tx-linux.git] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index d900f47eaa68526704a3bba7058bdc0044c97987..93027fdf47d1c7b610a4c7e15996bc288ceaba48 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -31,6 +31,11 @@ config SECURITY
 
          If you are unsure how to answer this question, answer N.
 
+config SECURITY_WRITABLE_HOOKS
+       depends on SECURITY
+       bool
+       default n
+
 config SECURITYFS
        bool "Enable the securityfs filesystem"
        help
@@ -125,17 +130,8 @@ config HAVE_HARDENED_USERCOPY_ALLOCATOR
          validating memory ranges against heap object sizes in
          support of CONFIG_HARDENED_USERCOPY.
 
-config HAVE_ARCH_HARDENED_USERCOPY
-       bool
-       help
-         The architecture supports CONFIG_HARDENED_USERCOPY by
-         calling check_object_size() just before performing the
-         userspace copies in the low level implementation of
-         copy_to_user() and copy_from_user().
-
 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