diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-18 19:41:47 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-18 19:41:47 -0700 |
| commit | c124891f50f11e33acdfa276864ea089bab726b6 (patch) | |
| tree | c22a23cf8264e5d0b5b01c21ea0497f7bc1bb1ac | |
| parent | 77f312a96dd1e01c49ccd872265e70a8346b53cc (diff) | |
| parent | 024e6cb408307de41cbfcb1e5a170d9af60ab2a9 (diff) | |
| download | blackbird-op-linux-c124891f50f11e33acdfa276864ea089bab726b6.tar.gz blackbird-op-linux-c124891f50f11e33acdfa276864ea089bab726b6.zip | |
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.
| -rw-r--r-- | security/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/security/Kconfig b/security/Kconfig index 9c60c346a91d..4c865345caa0 100644 --- a/security/Kconfig +++ b/security/Kconfig @@ -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 |
