nfsd: nfsd should drop CAP_MKNOD for non-root

[safe/jmp/linux-2.6] / net / x25 / x25_proc.c

diff --git a/net/x25/x25_proc.c b/net/x25/x25_proc.c
index e0470bd..1afa44d 100644 (file)
--- a/net/x25/x25_proc.c
+++ b/net/x25/x25_proc.c
@@ -3,7 +3,7 @@
  *
  *     This is ALPHA test software. This code may break your machine,
  *     randomly fail to work with new releases, misbehave and/or generally
- *     screw up. It might even work. 
+ *     screw up. It might even work.
  *
  *     This code REQUIRES 2.4 with seq_file support
  *
@@ -20,6 +20,7 @@
 #include <linux/init.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <net/x25.h>
 
@@ -40,6 +41,7 @@ found:
 }
 
 static void *x25_seq_route_start(struct seq_file *seq, loff_t *pos)
+       __acquires(x25_route_list_lock)
 {
        loff_t l = *pos;
 
@@ -62,13 +64,14 @@ static void *x25_seq_route_next(struct seq_file *seq, void *v, loff_t *pos)
        rt = v;
        if (rt->node.next != &x25_route_list)
                rt = list_entry(rt->node.next, struct x25_route, node);
-       else 
+       else
                rt = NULL;
 out:
        return rt;
 }
 
 static void x25_seq_route_stop(struct seq_file *seq, void *v)
+       __releases(x25_route_list_lock)
 {
        read_unlock_bh(&x25_route_list_lock);
 }
@@ -88,7 +91,7 @@ static int x25_seq_route_show(struct seq_file *seq, void *v)
                   rt->dev ? rt->dev->name : "???");
 out:
        return 0;
-} 
+}
 
 static __inline__ struct sock *x25_get_socket_idx(loff_t pos)
 {
@@ -104,6 +107,7 @@ found:
 }
 
 static void *x25_seq_socket_start(struct seq_file *seq, loff_t *pos)
+       __acquires(x25_list_lock)
 {
        loff_t l = *pos;
 
@@ -126,6 +130,7 @@ out:
 }
 
 static void x25_seq_socket_stop(struct seq_file *seq, void *v)
+       __releases(x25_list_lock)
 {
        read_unlock_bh(&x25_list_lock);
 }
@@ -163,7 +168,7 @@ static int x25_seq_socket_show(struct seq_file *seq, void *v)
                   s->sk_socket ? SOCK_INODE(s->sk_socket)->i_ino : 0L);
 out:
        return 0;
-} 
+}
 
 static __inline__ struct x25_forward *x25_get_forward_idx(loff_t pos)
 {
@@ -182,6 +187,7 @@ found:
 }
 
 static void *x25_seq_forward_start(struct seq_file *seq, loff_t *pos)
+       __acquires(x25_forward_list_lock)
 {
        loff_t l = *pos;
 
@@ -212,6 +218,7 @@ out:
 }
 
 static void x25_seq_forward_stop(struct seq_file *seq, void *v)
+       __releases(x25_forward_list_lock)
 {
        read_unlock_bh(&x25_forward_list_lock);
 }
@@ -234,21 +241,21 @@ out:
        return 0;
 }
 
-static struct seq_operations x25_seq_route_ops = {
+static const struct seq_operations x25_seq_route_ops = {
        .start  = x25_seq_route_start,
        .next   = x25_seq_route_next,
        .stop   = x25_seq_route_stop,
        .show   = x25_seq_route_show,
 };
 
-static struct seq_operations x25_seq_socket_ops = {
+static const struct seq_operations x25_seq_socket_ops = {
        .start  = x25_seq_socket_start,
        .next   = x25_seq_socket_next,
        .stop   = x25_seq_socket_stop,
        .show   = x25_seq_socket_show,
 };
 
-static struct seq_operations x25_seq_forward_ops = {
+static const struct seq_operations x25_seq_forward_ops = {
        .start  = x25_seq_forward_start,
        .next   = x25_seq_forward_next,
        .stop   = x25_seq_forward_stop,
@@ -270,7 +277,7 @@ static int x25_seq_forward_open(struct inode *inode, struct file *file)
        return seq_open(file, &x25_seq_forward_ops);
 }
 
-static struct file_operations x25_seq_socket_fops = {
+static const struct file_operations x25_seq_socket_fops = {
        .owner          = THIS_MODULE,
        .open           = x25_seq_socket_open,
        .read           = seq_read,
@@ -278,7 +285,7 @@ static struct file_operations x25_seq_socket_fops = {
        .release        = seq_release,
 };
 
-static struct file_operations x25_seq_route_fops = {
+static const struct file_operations x25_seq_route_fops = {
        .owner          = THIS_MODULE,
        .open           = x25_seq_route_open,
        .read           = seq_read,
@@ -286,7 +293,7 @@ static struct file_operations x25_seq_route_fops = {
        .release        = seq_release,
 };
 
-static struct file_operations x25_seq_forward_fops = {
+static const struct file_operations x25_seq_forward_fops = {
        .owner          = THIS_MODULE,
        .open           = x25_seq_forward_open,
        .read           = seq_read,
@@ -301,24 +308,22 @@ int __init x25_proc_init(void)
        struct proc_dir_entry *p;
        int rc = -ENOMEM;
 
-       x25_proc_dir = proc_mkdir("x25", proc_net);
+       x25_proc_dir = proc_mkdir("x25", init_net.proc_net);
        if (!x25_proc_dir)
                goto out;
 
-       p = create_proc_entry("route", S_IRUGO, x25_proc_dir);
+       p = proc_create("route", S_IRUGO, x25_proc_dir, &x25_seq_route_fops);
        if (!p)
                goto out_route;
-       p->proc_fops = &x25_seq_route_fops;
 
-       p = create_proc_entry("socket", S_IRUGO, x25_proc_dir);
+       p = proc_create("socket", S_IRUGO, x25_proc_dir, &x25_seq_socket_fops);
        if (!p)
                goto out_socket;
-       p->proc_fops = &x25_seq_socket_fops;
 
-       p = create_proc_entry("forward", S_IRUGO, x25_proc_dir);
+       p = proc_create("forward", S_IRUGO, x25_proc_dir,
+                       &x25_seq_forward_fops);
        if (!p)
                goto out_forward;
-       p->proc_fops = &x25_seq_forward_fops;
        rc = 0;
 
 out:
@@ -328,7 +333,7 @@ out_forward:
 out_socket:
        remove_proc_entry("route", x25_proc_dir);
 out_route:
-       remove_proc_entry("x25", proc_net);
+       remove_proc_entry("x25", init_net.proc_net);
        goto out;
 }
 
@@ -337,7 +342,7 @@ void __exit x25_proc_exit(void)
        remove_proc_entry("forward", x25_proc_dir);
        remove_proc_entry("route", x25_proc_dir);
        remove_proc_entry("socket", x25_proc_dir);
-       remove_proc_entry("x25", proc_net);
+       remove_proc_entry("x25", init_net.proc_net);
 }
 
 #else /* CONFIG_PROC_FS */