[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>

1 files changed, 5 insertions, 4 deletions

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);