diff options
author | Christoph Lameter <cl@linux-foundation.org> | 2009-06-03 16:04:31 -0400 |
---|---|---|
committer | James Morris <jmorris@namei.org> | 2009-06-04 12:07:48 +1000 |
commit | e0a94c2a63f2644826069044649669b5e7ca75d3 (patch) | |
tree | debf8a9af6ac23dadd116dc1cd1f9dcefe9629c6 /mm/mmap.c | |
parent | 7d2948b1248109dbc7f4aaf9867c54b1912d494c (diff) | |
download | linux-3.10-e0a94c2a63f2644826069044649669b5e7ca75d3.tar.gz linux-3.10-e0a94c2a63f2644826069044649669b5e7ca75d3.tar.bz2 linux-3.10-e0a94c2a63f2644826069044649669b5e7ca75d3.zip |
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/mmap.c')
-rw-r--r-- | mm/mmap.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/mm/mmap.c b/mm/mmap.c index 6b7b1a95944..2b43fa1aa3c 100644 --- a/mm/mmap.c +++ b/mm/mmap.c @@ -87,6 +87,9 @@ int sysctl_overcommit_ratio = 50; /* default is 50% */ int sysctl_max_map_count __read_mostly = DEFAULT_MAX_MAP_COUNT; struct percpu_counter vm_committed_as; +/* 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 |