kernel-doc: detect/prevent duplicate doc section names

[linux-2.6-omap-h63xx.git] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index 34f593410d57cb12070a154bc0fa0b272467dfeb..49b51f964897dcb7133be9b58f1b936462bb6309 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -22,16 +22,22 @@ config KEYS
          If you are unsure as to whether this is required, answer N.
 
 config KEYS_DEBUG_PROC_KEYS
          If you are unsure as to whether this is required, answer N.
 
 config KEYS_DEBUG_PROC_KEYS

-       bool "Enable the /proc/keys file by which all keys may be viewed"
+       bool "Enable the /proc/keys file by which keys may be viewed"

        depends on KEYS
        help
        depends on KEYS
        help

-         This option turns on support for the /proc/keys file through which
-         all the keys on the system can be listed.
+         This option turns on support for the /proc/keys file - through which
+         can be listed all the keys on the system that are viewable by the
+         reading process.

 
 

-         This option is a slight security risk in that it makes it possible
-         for anyone to see all the keys on the system. Normally the manager
-         pretends keys that are inaccessible to a process don't exist as far
-         as that process is concerned.
+         The only keys included in the list are those that grant View
+         permission to the reading process whether or not it possesses them.
+         Note that LSM security checks are still performed, and may further
+         filter out keys that the current process is not authorised to view.
+
+         Only key attributes are listed here; key payloads are not included in
+         the resulting table.
+
+         If you are unsure as to whether this is required, answer N.

 
 config SECURITY
        bool "Enable different security models"
 
 config SECURITY
        bool "Enable different security models"


@@ -68,15 +74,26 @@ config SECURITY_NETWORK_XFRM
          If you are unsure how to answer this question, answer N.
 
 config SECURITY_CAPABILITIES
          If you are unsure how to answer this question, answer N.
 
 config SECURITY_CAPABILITIES

-       tristate "Default Linux Capabilities"
+       bool "Default Linux Capabilities"

        depends on SECURITY
        depends on SECURITY

+       default y

        help
          This enables the "default" Linux capabilities functionality.
          If you are unsure how to answer this question, answer Y.
 
        help
          This enables the "default" Linux capabilities functionality.
          If you are unsure how to answer this question, answer Y.
 

+config SECURITY_FILE_CAPABILITIES
+       bool "File POSIX Capabilities (EXPERIMENTAL)"
+       depends on (SECURITY=n || SECURITY_CAPABILITIES!=n) && EXPERIMENTAL
+       default n
+       help
+         This enables filesystem capabilities, allowing you to give
+         binaries a subset of root's powers without using setuid 0.
+
+         If in doubt, answer N.
+

 config SECURITY_ROOTPLUG
 config SECURITY_ROOTPLUG

-       tristate "Root Plug Support"
-       depends on USB && SECURITY
+       bool "Root Plug Support"
+       depends on USB=y && SECURITY

        help
          This is a sample LSM module that should only be used as such.
          It prevents any programs running with egid == 0 if a specific
        help
          This is a sample LSM module that should only be used as such.
          It prevents any programs running with egid == 0 if a specific


@@ -87,19 +104,28 @@ config SECURITY_ROOTPLUG
          
          If you are unsure how to answer this question, answer N.
 
          
          If you are unsure how to answer this question, answer N.
 

-config SECURITY_SECLVL
-       tristate "BSD Secure Levels"
-       depends on SECURITY
-       select CRYPTO
-       select CRYPTO_SHA1
-       help
-         Implements BSD Secure Levels as an LSM.  See
-         <file:Documentation/seclvl.txt> for instructions on how to use this
-         module.
+config SECURITY_DEFAULT_MMAP_MIN_ADDR
+        int "Low address space to protect from user allocation"
+        depends on SECURITY
+        default 0
+        help
+         This is the portion of low virtual memory which should be protected
+         from userspace allocation.  Keeping a user from writing to low pages
+         can help reduce the impact of kernel NULL pointer bugs.
+
+         For most ia64, ppc64 and x86 users with lots of address space
+         a value of 65536 is reasonable and should cause no problems.
+         On arm and other archs it should not be higher than 32768.
+         Programs which use vm86 functionality would either need additional
+         permissions from either the LSM or the capabilities module or have
+         this protection disabled.
+
+         This value can be changed after boot using the
+         /proc/sys/vm/mmap_min_addr tunable.

 
 

-         If you are unsure how to answer this question, answer N.

 
 source security/selinux/Kconfig
 
 source security/selinux/Kconfig

+source security/smack/Kconfig

 
 endmenu
 
 
 endmenu