aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/sysctl.c
diff options
context:
space:
mode:
authorChristoph Lameter <cl@linux-foundation.org>2009-06-03 16:04:31 -0400
committerJames Morris <jmorris@namei.org>2009-06-03 22:07:48 -0400
commite0a94c2a63f2644826069044649669b5e7ca75d3 (patch)
treedebf8a9af6ac23dadd116dc1cd1f9dcefe9629c6 /kernel/sysctl.c
parent7d2948b1248109dbc7f4aaf9867c54b1912d494c (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 'kernel/sysctl.c')
-rw-r--r--kernel/sysctl.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 149581fb48ab..45bd711a242e 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -1237,7 +1237,6 @@ static struct ctl_table vm_table[] = {
1237 .strategy = &sysctl_jiffies, 1237 .strategy = &sysctl_jiffies,
1238 }, 1238 },
1239#endif 1239#endif
1240#ifdef CONFIG_SECURITY
1241 { 1240 {
1242 .ctl_name = CTL_UNNUMBERED, 1241 .ctl_name = CTL_UNNUMBERED,
1243 .procname = "mmap_min_addr", 1242 .procname = "mmap_min_addr",
@@ -1246,7 +1245,6 @@ static struct ctl_table vm_table[] = {
1246 .mode = 0644, 1245 .mode = 0644,
1247 .proc_handler = &proc_doulongvec_minmax, 1246 .proc_handler = &proc_doulongvec_minmax,
1248 }, 1247 },
1249#endif
1250#ifdef CONFIG_NUMA 1248#ifdef CONFIG_NUMA
1251 { 1249 {
1252 .ctl_name = CTL_UNNUMBERED, 1250 .ctl_name = CTL_UNNUMBERED,