Merge current mainline tree into linux-omap tree

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

diff --git a/security/Kconfig b/security/Kconfig
index 49fc5fcdfc724238e83b85cfd8d1fe2a9dd699ae..fb3425231927e6fdec4031a8162ae9e409f5d8b3 100644 (file)
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -76,6 +76,7 @@ config SECURITY_NETWORK_XFRM
 config SECURITY_CAPABILITIES
        bool "Default Linux Capabilities"
        depends on SECURITY
+       default y
        help
          This enables the "default" Linux capabilities functionality.
          If you are unsure how to answer this question, answer Y.
@@ -107,11 +108,32 @@ config SECURITY_LOWMEM
        tristate "Low memory watermark support"
        depends on SECURITY
        help
-         Implements low memory watermark support.
+         Implements low memory watermark support
 
          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
+         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.
+
+
 source security/selinux/Kconfig
+source security/smack/Kconfig
 
 endmenu