X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=security%2FKconfig;h=49b51f964897dcb7133be9b58f1b936462bb6309;hb=6910c1368104d50e6b6afc6c8b7e9d1670a374e7;hp=389e151e3b68e832d7b63b9623e10098d6d2e03b;hpb=6232665040f9a23fafd9d94d4ae8d5a2dc850f65;p=~andy%2Flinux

diff --git a/security/Kconfig b/security/Kconfig
index 389e151e3b6..49b51f96489 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -104,7 +104,28 @@ config SECURITY_ROOTPLUG
 	  
 	  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