Security/SELinux: seperate lsm specific mmap_min_addr

[safe/jmp/linux-2.6] / security / Kconfig

diff --git a/security/Kconfig b/security/Kconfig
index 49b51f9..9c60c34 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -51,6 +51,15 @@ config SECURITY
 
          If you are unsure how to answer this question, answer N.
 
 
          If you are unsure how to answer this question, answer N.
 

+config SECURITYFS
+       bool "Enable the securityfs filesystem"
+       help
+         This will build the securityfs filesystem.  It is currently used by
+         the TPM bios character driver and IMA, an integrity provider.  It is
+         not used by SELinux or SMACK.
+
+         If you are unsure how to answer this question, answer N.
+

 config SECURITY_NETWORK
        bool "Socket and Networking Security Hooks"
        depends on SECURITY
 config SECURITY_NETWORK
        bool "Socket and Networking Security Hooks"
        depends on SECURITY


@@ -73,17 +82,17 @@ config SECURITY_NETWORK_XFRM
          IPSec.
          If you are unsure how to answer this question, answer N.
 
          IPSec.
          If you are unsure how to answer this question, answer N.
 

-config SECURITY_CAPABILITIES
-       bool "Default Linux Capabilities"
+config SECURITY_PATH
+       bool "Security hooks for pathname based access control"

        depends on SECURITY
        depends on SECURITY

-       default y

        help
        help

-         This enables the "default" Linux capabilities functionality.
-         If you are unsure how to answer this question, answer Y.
+         This enables the security hooks for pathname based access control.
+         If enabled, a security module can use these hooks to
+         implement pathname based access controls.
+         If you are unsure how to answer this question, answer N.

 
 config SECURITY_FILE_CAPABILITIES
 
 config SECURITY_FILE_CAPABILITIES

-       bool "File POSIX Capabilities (EXPERIMENTAL)"
-       depends on (SECURITY=n || SECURITY_CAPABILITIES!=n) && EXPERIMENTAL
+       bool "File POSIX Capabilities"

        default n
        help
          This enables filesystem capabilities, allowing you to give
        default n
        help
          This enables filesystem capabilities, allowing you to give


@@ -101,14 +110,14 @@ config SECURITY_ROOTPLUG
 
          See <http://www.linuxjournal.com/article.php?sid=6279> for
          more information about this module.
 
          See <http://www.linuxjournal.com/article.php?sid=6279> for
          more information about this module.

-         
+

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

-config SECURITY_DEFAULT_MMAP_MIN_ADDR
-        int "Low address space to protect from user allocation"
-        depends on SECURITY
-        default 0
-        help
+config LSM_MMAP_MIN_ADDR
+       int "Low address space for LSM to from user allocation"
+       depends on SECURITY && SECURITY_SELINUX
+       default 65535
+       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.
          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.


@@ -116,16 +125,15 @@ config SECURITY_DEFAULT_MMAP_MIN_ADDR
          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.
          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.
-
+         Programs which use vm86 functionality or have some need to map
+         this low address space will need the permission specific to the
+         systems running LSM.

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

+source security/tomoyo/Kconfig
+
+source security/integrity/ima/Kconfig

 
 endmenu
 
 
 endmenu