]> git.openfabrics.org - ~shefty/rdma-dev.git/commitdiff
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Aug 2009 02:41:47 +0000 (19:41 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 19 Aug 2009 02:41:47 +0000 (19:41 -0700)
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6:
  security: Fix prompt for LSM_MMAP_MIN_ADDR
  security: Make LSM_MMAP_MIN_ADDR default match its help text.

security/Kconfig

index 9c60c346a91ddded5dcbff3186a0c501619ae477..4c865345caa01700451dd5aa7f8e290a2389690a 100644 (file)
@@ -114,9 +114,9 @@ config SECURITY_ROOTPLUG
          If you are unsure how to answer this question, answer N.
 
 config LSM_MMAP_MIN_ADDR
-       int "Low address space for LSM to from user allocation"
+       int "Low address space for LSM to protect from user allocation"
        depends on SECURITY && SECURITY_SELINUX
-       default 65535
+       default 65536
        help
          This is the portion of low virtual memory which should be protected
          from userspace allocation.  Keeping a user from writing to low pages