diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-18 22:41:47 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-08-18 22:41:47 -0400 |
| commit | c124891f50f11e33acdfa276864ea089bab726b6 (patch) | |
| tree | c22a23cf8264e5d0b5b01c21ea0497f7bc1bb1ac | |
| parent | 77f312a96dd1e01c49ccd872265e70a8346b53cc (diff) | |
| parent | 024e6cb408307de41cbfcb1e5a170d9af60ab2a9 (diff) | |
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 | |||
| 114 | If you are unsure how to answer this question, answer N. | 114 | If you are unsure how to answer this question, answer N. |
| 115 | 115 | ||
| 116 | config LSM_MMAP_MIN_ADDR | 116 | config LSM_MMAP_MIN_ADDR |
| 117 | int "Low address space for LSM to from user allocation" | 117 | int "Low address space for LSM to protect from user allocation" |
| 118 | depends on SECURITY && SECURITY_SELINUX | 118 | depends on SECURITY && SECURITY_SELINUX |
| 119 | default 65535 | 119 | default 65536 |
| 120 | help | 120 | help |
| 121 | This is the portion of low virtual memory which should be protected | 121 | This is the portion of low virtual memory which should be protected |
| 122 | from userspace allocation. Keeping a user from writing to low pages | 122 | from userspace allocation. Keeping a user from writing to low pages |