diff options
| author | Christoph Lameter <cl@linux-foundation.org> | 2009-06-03 16:04:31 -0400 |
|---|---|---|
| committer | Nick Pelly <npelly@google.com> | 2009-08-13 15:06:08 -0700 |
| commit | 05f6ab599ef820e96070cc66c00953d8506d1026 (patch) | |
| tree | 7574471205dea1c3bf237f3cb4fc66e709fda49a /mm | |
| parent | c8853459b739e5f43da0badc1605a0a0c0c8195d (diff) | |
security: use mmap_min_addr indepedently of security models
This patch removes the dependency of mmap_min_addr on CONFIG_SECURITY.
It also sets a default mmap_min_addr of 4096.
mmapping of addresses below 4096 will only be possible for processes
with CAP_SYS_RAWIO.
Signed-off-by: Christoph Lameter <cl@linux-foundation.org>
Acked-by: Eric Paris <eparis@redhat.com>
Looks-ok-by: Linus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/Kconfig | 18 | ||||
| -rw-r--r-- | mm/mmap.c | 3 |
2 files changed, 21 insertions, 0 deletions
diff --git a/mm/Kconfig b/mm/Kconfig index a5b77811fdf2..54c5251794b4 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -216,3 +216,21 @@ config UNEVICTABLE_LRU config MMU_NOTIFIER bool + +config DEFAULT_MMAP_MIN_ADDR + int "Low address space to protect from user allocation" + default 4096 + help + This is the portion of low virtual memory which should be protected + from userspace allocation. Keeping a user from writing to low pages + can help reduce the impact of kernel NULL pointer bugs. + + 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. diff --git a/mm/mmap.c b/mm/mmap.c index 00ced3ee49a8..fa9ef7afeee6 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -86,6 +86,9 @@ int sysctl_overcommit_ratio = 50; /* default is 50% */ int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT; atomic_long_t vm_committed_space = ATOMIC_LONG_INIT(0); +/* amount of vm to protect from userspace access */ +unsigned long mmap_min_addr = CONFIG_DEFAULT_MMAP_MIN_ADDR; + /* * Check that a process has enough memory to allocate a new virtual * mapping. 0 means there is enough memory for the allocation to |