summaryrefslogtreecommitdiffstats
path: root/security/min_addr.c
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2009-12-10 15:40:31 +0900
committerPaul Mundt <lethal@linux-sh.org>2009-12-10 15:40:31 +0900
commitb5c00a3a412857d6f07970984068c450429e051c (patch)
tree1fde50630cbc24e11a45169f717f281db8eb6dcc /security/min_addr.c
parentca6f2d7fafd2d48b2f6943f5c6787beaec2014d0 (diff)
parent3067e02f8f3ae2f3f02ba76400d03b8bcb4942b0 (diff)
downloadkernel-crypto-b5c00a3a412857d6f07970984068c450429e051c.tar.gz
kernel-crypto-b5c00a3a412857d6f07970984068c450429e051c.tar.xz
kernel-crypto-b5c00a3a412857d6f07970984068c450429e051c.zip
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for-2.6.33
Diffstat (limited to 'security/min_addr.c')
-rw-r--r--security/min_addr.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/security/min_addr.c b/security/min_addr.c
index c844eed7915..fc43c9d3708 100644
--- a/security/min_addr.c
+++ b/security/min_addr.c
@@ -33,6 +33,9 @@ int mmap_min_addr_handler(struct ctl_table *table, int write,
{
int ret;
+ if (!capable(CAP_SYS_RAWIO))
+ return -EPERM;
+
ret = proc_doulongvec_minmax(table, write, buffer, lenp, ppos);
update_mmap_min_addr();