Merge branch 'work.read_write' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

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

diff --git a/security/Kconfig b/security/Kconfig
index 93027fdf47d1c7b610a4c7e15996bc288ceaba48..d540bfe7319035e9ae6de6dd63e3f404530efb6e 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -54,6 +54,15 @@ config SECURITY_NETWORK
          implement socket and networking access controls.
          If you are unsure how to answer this question, answer N.
 
+config SECURITY_INFINIBAND
+       bool "Infiniband Security Hooks"
+       depends on SECURITY && INFINIBAND
+       help
+         This enables the Infiniband security hooks.
+         If enabled, a security module can use these hooks to
+         implement Infiniband access controls.
+         If you are unsure how to answer this question, answer N.
+
 config SECURITY_NETWORK_XFRM
        bool "XFRM (IPSec) Networking Security Hooks"
        depends on XFRM && SECURITY_NETWORK
@@ -139,7 +148,7 @@ config HARDENED_USERCOPY
          copying memory to/from the kernel (via copy_to_user() and
          copy_from_user() functions) by rejecting memory ranges that
          are larger than the specified heap object, span multiple
-         separately allocates pages, are not on the process stack,
+         separately allocated pages, are not on the process stack,
          or are part of the kernel text. This kills entire classes
          of heap overflow exploits and similar kernel memory exposures.