2.6.25-rc7

 security

diff --git a/security/Kconfig b/security/Kconfig
index 8086e61..5dfc206 100644
--- 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.
@@ -103,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