[NET]: Make /proc/net per network namespace

This patch makes /proc/net per network namespace.  It modifies the global
variables proc_net and proc_net_stat to be per network namespace.
The proc_net file helpers are modified to take a network namespace argument,
and all of their callers are fixed to pass &init_net for that argument.
This ensures that all of the /proc/net files are only visible and
usable in the initial network namespace until the code behind them
has been updated to be handle multiple network namespaces.

Making /proc/net per namespace is necessary as at least some files
in /proc/net depend upon the set of network devices which is per
network namespace, and even more files in /proc/net have contents
that are relevant to a single network namespace.

Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

5 files changed, 21 insertions, 16 deletions

diff --git a/net/core/dev.c b/net/core/dev.c
index 29cf00c5d865..618fb1c1dd47 100644
--- a/net/core/dev.c
+++ b/net/core/dev.c
@@ -92,6 +92,7 @@
 #include <linux/etherdevice.h>
 #include <linux/notifier.h>
 #include <linux/skbuff.h>
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <linux/rtnetlink.h>
 #include <linux/proc_fs.h>
@@ -2556,24 +2557,24 @@ static int __init dev_proc_init(void)
 {
         int rc = -ENOMEM;
 
-        if (!proc_net_fops_create("dev", S_IRUGO, &dev_seq_fops))
+        if (!proc_net_fops_create(&init_net, "dev", S_IRUGO, &dev_seq_fops))
                 goto out;
-        if (!proc_net_fops_create("softnet_stat", S_IRUGO, &softnet_seq_fops))
+        if (!proc_net_fops_create(&init_net, "softnet_stat", S_IRUGO, &softnet_seq_fops))
                 goto out_dev;
-        if (!proc_net_fops_create("ptype", S_IRUGO, &ptype_seq_fops))
-                goto out_dev2;
+        if (!proc_net_fops_create(&init_net, "ptype", S_IRUGO, &ptype_seq_fops))
+                goto out_softnet;
 
         if (wext_proc_init())
-                goto out_softnet;
+                goto out_ptype;
         rc = 0;
 out:
         return rc;
+out_ptype:
+        proc_net_remove(&init_net, "ptype");
 out_softnet:
-        proc_net_remove("ptype");
-out_dev2:
-        proc_net_remove("softnet_stat");
+        proc_net_remove(&init_net, "softnet_stat");
 out_dev:
-        proc_net_remove("dev");
+        proc_net_remove(&init_net, "dev");
         goto out;
 }
 #else
diff --git a/net/core/dev_mcast.c b/net/core/dev_mcast.c
index 20330c572610..8e069fc207cb 100644
--- a/net/core/dev_mcast.c
+++ b/net/core/dev_mcast.c
@@ -41,6 +41,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/init.h>
+#include <net/net_namespace.h>
 #include <net/ip.h>
 #include <net/route.h>
 #include <linux/skbuff.h>
@@ -254,7 +255,7 @@ static const struct file_operations dev_mc_seq_fops = {
 
 void __init dev_mcast_init(void)
 {
-        proc_net_fops_create("dev_mcast", 0, &dev_mc_seq_fops);
+        proc_net_fops_create(&init_net, "dev_mcast", 0, &dev_mc_seq_fops);
 }
 
 EXPORT_SYMBOL(dev_mc_add);
diff --git a/net/core/neighbour.c b/net/core/neighbour.c
index ecd43c4a2221..5f25f4f79b8c 100644
--- a/net/core/neighbour.c
+++ b/net/core/neighbour.c
@@ -25,6 +25,7 @@
 #include <linux/sysctl.h>
 #endif
 #include <linux/times.h>
+#include <net/net_namespace.h>
 #include <net/neighbour.h>
 #include <net/dst.h>
 #include <net/sock.h>
@@ -1350,7 +1351,7 @@ void neigh_table_init_no_netlink(struct neigh_table *tbl)
                 panic("cannot create neighbour cache statistics");
 
 #ifdef CONFIG_PROC_FS
-        tbl->pde = create_proc_entry(tbl->id, 0, proc_net_stat);
+        tbl->pde = create_proc_entry(tbl->id, 0, init_net.proc_net_stat);
         if (!tbl->pde)
                 panic("cannot create neighbour proc dir entry");
         tbl->pde->proc_fops = &neigh_stat_seq_fops;
diff --git a/net/core/pktgen.c b/net/core/pktgen.c
index 84c0edeedf6d..33d7247fb19d 100644
--- a/net/core/pktgen.c
+++ b/net/core/pktgen.c
@@ -152,6 +152,7 @@
 #include <linux/wait.h>
 #include <linux/etherdevice.h>
 #include <linux/kthread.h>
+#include <net/net_namespace.h>
 #include <net/checksum.h>
 #include <net/ipv6.h>
 #include <net/addrconf.h>
@@ -3808,7 +3809,7 @@ static int __init pg_init(void)
 
         printk(KERN_INFO "%s", version);
 
-        pg_proc_dir = proc_mkdir(PG_PROC_DIR, proc_net);
+        pg_proc_dir = proc_mkdir(PG_PROC_DIR, init_net.proc_net);
         if (!pg_proc_dir)
                 return -ENODEV;
         pg_proc_dir->owner = THIS_MODULE;
@@ -3817,7 +3818,7 @@ static int __init pg_init(void)
         if (pe == NULL) {
                 printk(KERN_ERR "pktgen: ERROR: cannot create %s "
                        "procfs entry.\n", PGCTRL);
-                proc_net_remove(PG_PROC_DIR);
+                proc_net_remove(&init_net, PG_PROC_DIR);
                 return -EINVAL;
         }
 
@@ -3841,7 +3842,7 @@ static int __init pg_init(void)
                        "all threads\n");
                 unregister_netdevice_notifier(&pktgen_notifier_block);
                 remove_proc_entry(PGCTRL, pg_proc_dir);
-                proc_net_remove(PG_PROC_DIR);
+                proc_net_remove(&init_net, PG_PROC_DIR);
                 return -ENODEV;
         }
 
@@ -3868,7 +3869,7 @@ static void __exit pg_cleanup(void)
 
         /* Clean up proc file system */
         remove_proc_entry(PGCTRL, pg_proc_dir);
-        proc_net_remove(PG_PROC_DIR);
+        proc_net_remove(&init_net, PG_PROC_DIR);
 }
 
 module_init(pg_init);
diff --git a/net/core/sock.c b/net/core/sock.c
index beb924c248e8..bbc726a49d87 100644
--- a/net/core/sock.c
+++ b/net/core/sock.c
@@ -119,6 +119,7 @@
 #include <linux/netdevice.h>
 #include <net/protocol.h>
 #include <linux/skbuff.h>
+#include <net/net_namespace.h>
 #include <net/request_sock.h>
 #include <net/sock.h>
 #include <net/xfrm.h>
@@ -1973,7 +1974,7 @@ static const struct file_operations proto_seq_fops = {
 static int __init proto_init(void)
 {
         /* register /proc/net/protocols */
-        return proc_net_fops_create("protocols", S_IRUGO, &proto_seq_fops) == NULL ? -ENOBUFS : 0;
+        return proc_net_fops_create(&init_net, "protocols", S_IRUGO, &proto_seq_fops) == NULL ? -ENOBUFS : 0;
 }
 
 subsys_initcall(proto_init);