Home Explore Help
Register Sign In
phyus
/
linux-vybrid_public
8
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/security-testing-2.6

* '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.
Linus Torvalds 15 years ago
parent
77f312a96d 024e6cb408
commit
c124891f50
1 changed files with 2 additions and 2 deletions
Unified View Show Diff Stats
  1. 2 2
      security/Kconfig

+ 2 - 2
security/Kconfig
View File 

@@ -114,9 +114,9 @@ config SECURITY_ROOTPLUG
 
 	  If you are unsure how to answer this question, answer N.
 
 	  If you are unsure how to answer this question, answer N.
 
 
 
 config LSM_MMAP_MIN_ADDR
 
 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
 
 	depends on SECURITY && SECURITY_SELINUX
 
-	default 65535
 
+	default 65536
 
 	help
 
 	help
 
 	  This is the portion of low virtual memory which should be protected
 
 	  This is the portion of low virtual memory which should be protected
 
 	  from userspace allocation.  Keeping a user from writing to low pages
 
 	  from userspace allocation.  Keeping a user from writing to low pages