diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:19:40 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-04-18 08:19:40 -0700 |
commit | 30bc94566e396b432b72e2f3518e19225dc2672d (patch) | |
tree | 50eba6ade66fbed5106a40aa68ab36926b7beb6b /security/Kconfig | |
parent | 4cba84b5d61af81f1f329f4d05170427a9819c39 (diff) | |
parent | 5f46ce14bd432cf52bf91079270af164ca48f821 (diff) |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/selinux-2.6:
security: enhance DEFAULT_MMAP_MIN_ADDR description
SELinux: add netport.[ch]
SELinux: Add network port SID cache
SELinux: turn mount options strings into defines
selinux/ss/services.c should #include <linux/selinux.h>
selinux: introduce permissive types
selinux: remove ptrace_sid
SELinux: requesting no permissions in avc_has_perm_noaudit is a BUG()
security: code cleanup
security: replace remaining __FUNCTION__ occurrences
SELinux: create new open permission
selinux: selinux/netlabel.c should #include "netlabel.h"
SELinux: unify printk messages
SELinux: remove unused backpointers from security objects
SELinux: Correct the NetLabel locking for the sk_security_struct
Diffstat (limited to 'security/Kconfig')
-rw-r--r-- | security/Kconfig | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/security/Kconfig b/security/Kconfig index 5dfc206748c..49b51f96489 100644 --- a/security/Kconfig +++ b/security/Kconfig @@ -113,10 +113,12 @@ config SECURITY_DEFAULT_MMAP_MIN_ADDR from userspace allocation. Keeping a user from writing to low pages can help reduce the impact of kernel NULL pointer bugs. - For most users with lots of address space a value of 65536 is - reasonable and should cause no problems. Programs which use vm86 - functionality would either need additional permissions from either - the LSM or the capabilities module or have this protection disabled. + For most ia64, ppc64 and x86 users with lots of address space + a value of 65536 is reasonable and should cause no problems. + On arm and other archs it should not be higher than 32768. + Programs which use vm86 functionality would either need additional + permissions from either the LSM or the capabilities module or have + this protection disabled. This value can be changed after boot using the /proc/sys/vm/mmap_min_addr tunable. |