UBUNTU: Ubuntu-2.6.38-12.51

[linux-flexiantxendom0-natty.git] / security / min_addr.c

diff --git a/security/min_addr.c b/security/min_addr.c
index 14cc7b3..f728728 100644 (file)
--- a/security/min_addr.c
+++ b/security/min_addr.c
@@ -28,19 +28,22 @@ static void update_mmap_min_addr(void)
  * sysctl handler which just sets dac_mmap_min_addr = the new value and then
  * calls update_mmap_min_addr() so non MAP_FIXED hints get rounded properly
  */
-int mmap_min_addr_handler(struct ctl_table *table, int write, struct file *filp,
+int mmap_min_addr_handler(struct ctl_table *table, int write,
                          void __user *buffer, size_t *lenp, loff_t *ppos)
 {
        int ret;
 
-       ret = proc_doulongvec_minmax(table, write, filp, buffer, lenp, ppos);
+       if (write && !capable(CAP_SYS_RAWIO))
+               return -EPERM;
+
+       ret = proc_doulongvec_minmax(table, write, buffer, lenp, ppos);
 
        update_mmap_min_addr();
 
        return ret;
 }
 
-int __init init_mmap_min_addr(void)
+static int __init init_mmap_min_addr(void)
 {
        update_mmap_min_addr();