Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c124891f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of... 

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.
parents 77f312a9 024e6cb4

security/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -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