diff options
| author | Christoph Lameter <cl@linux-foundation.org> | 2009-06-03 16:04:31 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-07-19 20:44:59 -0700 |
| commit | d6055cd3a734696779d238f9e54174954f22c4c9 (patch) | |
| tree | b8b99dae159c10c22dd92a77d3f7ad85d40899a1 /mm | |
| parent | 92e7e4cf8ce653e532aa3cb9857df8316a6b2731 (diff) | |
security: use mmap_min_addr indepedently of security models
commit e0a94c2a63f2644826069044649669b5e7ca75d3 upstream.
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 0bd9c2dbb2a0..07b4ec477103 100644 --- a/mm/Kconfig +++ b/mm/Kconfig @@ -208,3 +208,21 @@ config VIRT_TO_BUS 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 2ae093ed2cac..d330758ccfed 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 |