X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=security%2FKconfig;h=5dfc206748cfbd76f2e1f3114515aba7294cf67c;hb=ac7c5353b189e10cf5dd27399f64f7b013abffc6;hp=389e151e3b68e832d7b63b9623e10098d6d2e03b;hpb=f71ea9ddf0ff110f3fcbb89a46686bfba264014c;p=linux-2.6

diff --git a/security/Kconfig b/security/Kconfig
index 389e151e3b..5dfc206748 100644
--- a/security/Kconfig
+++ b/security/Kconfig
@@ -104,7 +104,26 @@ 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 users with lots of address space a value of 65536 is
+	  reasonable and should cause no problems.  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