git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'vhost' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost
[safe/jmp/linux-2.6]
/
security
/
min_addr.c
diff --git
a/security/min_addr.c
b/security/min_addr.c
index
c844eed
..
e86f297
100644
(file)
--- 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;
{
int ret;
+ if (!capable(CAP_SYS_RAWIO))
+ return -EPERM;
+
ret = proc_doulongvec_minmax(table, write, buffer, lenp, ppos);
update_mmap_min_addr();
ret = proc_doulongvec_minmax(table, write, buffer, lenp, ppos);
update_mmap_min_addr();
@@
-40,7
+43,7
@@
int mmap_min_addr_handler(struct ctl_table *table, int write,
return ret;
}
return ret;
}
-int __init init_mmap_min_addr(void)
+
static
int __init init_mmap_min_addr(void)
{
update_mmap_min_addr();
{
update_mmap_min_addr();