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

20 files changed, 77 insertions, 58 deletions

diff --git a/net/ipv4/arp.c b/net/ipv4/arp.c
index 9ab9d534fbac..78dd3443016c 100644
--- a/net/ipv4/arp.c
+++ b/net/ipv4/arp.c
@@ -103,6 +103,7 @@
 #include <linux/sysctl.h>
 #endif
 
+#include <net/net_namespace.h>
 #include <net/ip.h>
 #include <net/icmp.h>
 #include <net/route.h>
@@ -1400,7 +1401,7 @@ static const struct file_operations arp_seq_fops = {
 
 static int __init arp_proc_init(void)
 {
-        if (!proc_net_fops_create("arp", S_IRUGO, &arp_seq_fops))
+        if (!proc_net_fops_create(&init_net, "arp", S_IRUGO, &arp_seq_fops))
                 return -ENOMEM;
         return 0;
 }
diff --git a/net/ipv4/fib_hash.c b/net/ipv4/fib_hash.c
index 9ad1d9ff9ce7..9fafbeea8fe6 100644
--- a/net/ipv4/fib_hash.c
+++ b/net/ipv4/fib_hash.c
@@ -35,6 +35,7 @@
 #include <linux/netlink.h>
 #include <linux/init.h>
 
+#include <net/net_namespace.h>
 #include <net/ip.h>
 #include <net/protocol.h>
 #include <net/route.h>
@@ -1068,13 +1069,13 @@ static const struct file_operations fib_seq_fops = {
 
 int __init fib_proc_init(void)
 {
-        if (!proc_net_fops_create("route", S_IRUGO, &fib_seq_fops))
+        if (!proc_net_fops_create(&init_net, "route", S_IRUGO, &fib_seq_fops))
                 return -ENOMEM;
         return 0;
 }
 
 void __init fib_proc_exit(void)
 {
-        proc_net_remove("route");
+        proc_net_remove(&init_net, "route");
 }
 #endif /* CONFIG_PROC_FS */
diff --git a/net/ipv4/fib_trie.c b/net/ipv4/fib_trie.c
index 52b2891c63b7..be34bd556d58 100644
--- a/net/ipv4/fib_trie.c
+++ b/net/ipv4/fib_trie.c
@@ -73,6 +73,7 @@
 #include <linux/netlink.h>
 #include <linux/init.h>
 #include <linux/list.h>
+#include <net/net_namespace.h>
 #include <net/ip.h>
 #include <net/protocol.h>
 #include <net/route.h>
@@ -2530,30 +2531,30 @@ static const struct file_operations fib_route_fops = {
 
 int __init fib_proc_init(void)
 {
-        if (!proc_net_fops_create("fib_trie", S_IRUGO, &fib_trie_fops))
+        if (!proc_net_fops_create(&init_net, "fib_trie", S_IRUGO, &fib_trie_fops))
                 goto out1;
 
-        if (!proc_net_fops_create("fib_triestat", S_IRUGO, &fib_triestat_fops))
+        if (!proc_net_fops_create(&init_net, "fib_triestat", S_IRUGO, &fib_triestat_fops))
                 goto out2;
 
-        if (!proc_net_fops_create("route", S_IRUGO, &fib_route_fops))
+        if (!proc_net_fops_create(&init_net, "route", S_IRUGO, &fib_route_fops))
                 goto out3;
 
         return 0;
 
 out3:
-        proc_net_remove("fib_triestat");
+        proc_net_remove(&init_net, "fib_triestat");
 out2:
-        proc_net_remove("fib_trie");
+        proc_net_remove(&init_net, "fib_trie");
 out1:
         return -ENOMEM;
 }
 
 void __init fib_proc_exit(void)
 {
-        proc_net_remove("fib_trie");
-        proc_net_remove("fib_triestat");
-        proc_net_remove("route");
+        proc_net_remove(&init_net, "fib_trie");
+        proc_net_remove(&init_net, "fib_triestat");
+        proc_net_remove(&init_net, "route");
 }
 
 #endif /* CONFIG_PROC_FS */
diff --git a/net/ipv4/igmp.c b/net/ipv4/igmp.c
index a646409c2d06..d78599a9dbd5 100644
--- a/net/ipv4/igmp.c
+++ b/net/ipv4/igmp.c
@@ -91,6 +91,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/times.h>
 
+#include <net/net_namespace.h>
 #include <net/arp.h>
 #include <net/ip.h>
 #include <net/protocol.h>
@@ -2613,8 +2614,8 @@ static const struct file_operations igmp_mcf_seq_fops = {
 
 int __init igmp_mc_proc_init(void)
 {
-        proc_net_fops_create("igmp", S_IRUGO, &igmp_mc_seq_fops);
-        proc_net_fops_create("mcfilter", S_IRUGO, &igmp_mcf_seq_fops);
+        proc_net_fops_create(&init_net, "igmp", S_IRUGO, &igmp_mc_seq_fops);
+        proc_net_fops_create(&init_net, "mcfilter", S_IRUGO, &igmp_mcf_seq_fops);
         return 0;
 }
 #endif
diff --git a/net/ipv4/ipconfig.c b/net/ipv4/ipconfig.c
index c5b247077539..5ae4849878a3 100644
--- a/net/ipv4/ipconfig.c
+++ b/net/ipv4/ipconfig.c
@@ -55,6 +55,7 @@
 #include <linux/root_dev.h>
 #include <linux/delay.h>
 #include <linux/nfs_fs.h>
+#include <net/net_namespace.h>
 #include <net/arp.h>
 #include <net/ip.h>
 #include <net/ipconfig.h>
@@ -1253,7 +1254,7 @@ static int __init ip_auto_config(void)
         __be32 addr;
 
 #ifdef CONFIG_PROC_FS
-        proc_net_fops_create("pnp", S_IRUGO, &pnp_seq_fops);
+        proc_net_fops_create(&init_net, "pnp", S_IRUGO, &pnp_seq_fops);
 #endif /* CONFIG_PROC_FS */
 
         if (!ic_enable)
diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c
index 7003cc1b7fe2..35683e1a42e8 100644
--- a/net/ipv4/ipmr.c
+++ b/net/ipv4/ipmr.c
@@ -49,6 +49,7 @@
 #include <linux/mroute.h>
 #include <linux/init.h>
 #include <linux/if_ether.h>
+#include <net/net_namespace.h>
 #include <net/ip.h>
 #include <net/protocol.h>
 #include <linux/skbuff.h>
@@ -1922,7 +1923,7 @@ void __init ip_mr_init(void)
         ipmr_expire_timer.function=ipmr_expire_process;
         register_netdevice_notifier(&ip_mr_notifier);
 #ifdef CONFIG_PROC_FS
-        proc_net_fops_create("ip_mr_vif", 0, &ipmr_vif_fops);
-        proc_net_fops_create("ip_mr_cache", 0, &ipmr_mfc_fops);
+        proc_net_fops_create(&init_net, "ip_mr_vif", 0, &ipmr_vif_fops);
+        proc_net_fops_create(&init_net, "ip_mr_cache", 0, &ipmr_mfc_fops);
 #endif
 }
diff --git a/net/ipv4/ipvs/ip_vs_app.c b/net/ipv4/ipvs/ip_vs_app.c
index 8d6901d4e94f..341474eefa55 100644
--- a/net/ipv4/ipvs/ip_vs_app.c
+++ b/net/ipv4/ipvs/ip_vs_app.c
@@ -25,6 +25,7 @@
 #include <linux/skbuff.h>
 #include <linux/in.h>
 #include <linux/ip.h>
+#include <net/net_namespace.h>
 #include <net/protocol.h>
 #include <net/tcp.h>
 #include <asm/system.h>
@@ -616,12 +617,12 @@ int ip_vs_skb_replace(struct sk_buff *skb, gfp_t pri,
 int ip_vs_app_init(void)
 {
         /* we will replace it with proc_net_ipvs_create() soon */
-        proc_net_fops_create("ip_vs_app", 0, &ip_vs_app_fops);
+        proc_net_fops_create(&init_net, "ip_vs_app", 0, &ip_vs_app_fops);
         return 0;
 }
 
 
 void ip_vs_app_cleanup(void)
 {
-        proc_net_remove("ip_vs_app");
+        proc_net_remove(&init_net, "ip_vs_app");
 }
diff --git a/net/ipv4/ipvs/ip_vs_conn.c b/net/ipv4/ipvs/ip_vs_conn.c
index d612a6a5d957..4b702f708d30 100644
--- a/net/ipv4/ipvs/ip_vs_conn.c
+++ b/net/ipv4/ipvs/ip_vs_conn.c
@@ -35,6 +35,7 @@
 #include <linux/jhash.h>
 #include <linux/random.h>
 
+#include <net/net_namespace.h>
 #include <net/ip_vs.h>
 
 
@@ -922,7 +923,7 @@ int ip_vs_conn_init(void)
                 rwlock_init(&__ip_vs_conntbl_lock_array[idx].l);
         }
 
-        proc_net_fops_create("ip_vs_conn", 0, &ip_vs_conn_fops);
+        proc_net_fops_create(&init_net, "ip_vs_conn", 0, &ip_vs_conn_fops);
 
         /* calculate the random value for connection hash */
         get_random_bytes(&ip_vs_conn_rnd, sizeof(ip_vs_conn_rnd));
@@ -938,6 +939,6 @@ void ip_vs_conn_cleanup(void)
 
         /* Release the empty cache */
         kmem_cache_destroy(ip_vs_conn_cachep);
-        proc_net_remove("ip_vs_conn");
+        proc_net_remove(&init_net, "ip_vs_conn");
         vfree(ip_vs_conn_tab);
 }
diff --git a/net/ipv4/ipvs/ip_vs_ctl.c b/net/ipv4/ipvs/ip_vs_ctl.c
index f656d41d8d41..61d023d58b5d 100644
--- a/net/ipv4/ipvs/ip_vs_ctl.c
+++ b/net/ipv4/ipvs/ip_vs_ctl.c
@@ -35,6 +35,7 @@
 #include <linux/netfilter_ipv4.h>
 #include <linux/mutex.h>
 
+#include <net/net_namespace.h>
 #include <net/ip.h>
 #include <net/route.h>
 #include <net/sock.h>
@@ -2356,8 +2357,8 @@ int ip_vs_control_init(void)
                 return ret;
         }
 
-        proc_net_fops_create("ip_vs", 0, &ip_vs_info_fops);
-        proc_net_fops_create("ip_vs_stats",0, &ip_vs_stats_fops);
+        proc_net_fops_create(&init_net, "ip_vs", 0, &ip_vs_info_fops);
+        proc_net_fops_create(&init_net, "ip_vs_stats",0, &ip_vs_stats_fops);
 
         sysctl_header = register_sysctl_table(vs_root_table);
 
@@ -2390,8 +2391,8 @@ void ip_vs_control_cleanup(void)
         cancel_work_sync(&defense_work.work);
         ip_vs_kill_estimator(&ip_vs_stats);
         unregister_sysctl_table(sysctl_header);
-        proc_net_remove("ip_vs_stats");
-        proc_net_remove("ip_vs");
+        proc_net_remove(&init_net, "ip_vs_stats");
+        proc_net_remove(&init_net, "ip_vs");
         nf_unregister_sockopt(&ip_vs_sockopts);
         LeaveFunction(2);
 }
diff --git a/net/ipv4/ipvs/ip_vs_lblcr.c b/net/ipv4/ipvs/ip_vs_lblcr.c
index 6225acac7a3b..6a1fec416eaf 100644
--- a/net/ipv4/ipvs/ip_vs_lblcr.c
+++ b/net/ipv4/ipvs/ip_vs_lblcr.c
@@ -50,6 +50,7 @@
 #include <linux/sysctl.h>
 /* for proc_net_create/proc_net_remove */
 #include <linux/proc_fs.h>
+#include <net/net_namespace.h>
 
 #include <net/ip_vs.h>
 
@@ -843,7 +844,7 @@ static int __init ip_vs_lblcr_init(void)
         INIT_LIST_HEAD(&ip_vs_lblcr_scheduler.n_list);
         sysctl_header = register_sysctl_table(lblcr_root_table);
 #ifdef CONFIG_IP_VS_LBLCR_DEBUG
-        proc_net_create("ip_vs_lblcr", 0, ip_vs_lblcr_getinfo);
+        proc_net_create(&init_net, "ip_vs_lblcr", 0, ip_vs_lblcr_getinfo);
 #endif
         return register_ip_vs_scheduler(&ip_vs_lblcr_scheduler);
 }
@@ -852,7 +853,7 @@ static int __init ip_vs_lblcr_init(void)
 static void __exit ip_vs_lblcr_cleanup(void)
 {
 #ifdef CONFIG_IP_VS_LBLCR_DEBUG
-        proc_net_remove("ip_vs_lblcr");
+        proc_net_remove(&init_net, "ip_vs_lblcr");
 #endif
         unregister_sysctl_table(sysctl_header);
         unregister_ip_vs_scheduler(&ip_vs_lblcr_scheduler);
diff --git a/net/ipv4/netfilter/ip_queue.c b/net/ipv4/netfilter/ip_queue.c
index 702d94db19b9..cb5e61a1d7ab 100644
--- a/net/ipv4/netfilter/ip_queue.c
+++ b/net/ipv4/netfilter/ip_queue.c
@@ -24,6 +24,7 @@
 #include <linux/proc_fs.h>
 #include <linux/security.h>
 #include <linux/mutex.h>
+#include <net/net_namespace.h>
 #include <net/sock.h>
 #include <net/route.h>
 
@@ -674,7 +675,7 @@ static int __init ip_queue_init(void)
                 goto cleanup_netlink_notifier;
         }
 
-        proc = proc_net_create(IPQ_PROC_FS_NAME, 0, ipq_get_info);
+        proc = proc_net_create(&init_net, IPQ_PROC_FS_NAME, 0, ipq_get_info);
         if (proc)
                 proc->owner = THIS_MODULE;
         else {
@@ -695,8 +696,7 @@ static int __init ip_queue_init(void)
 cleanup_sysctl:
         unregister_sysctl_table(ipq_sysctl_header);
         unregister_netdevice_notifier(&ipq_dev_notifier);
-        proc_net_remove(IPQ_PROC_FS_NAME);
-
+        proc_net_remove(&init_net, IPQ_PROC_FS_NAME);
 cleanup_ipqnl:
         sock_release(ipqnl->sk_socket);
         mutex_lock(&ipqnl_mutex);
@@ -715,7 +715,7 @@ static void __exit ip_queue_fini(void)
 
         unregister_sysctl_table(ipq_sysctl_header);
         unregister_netdevice_notifier(&ipq_dev_notifier);
-        proc_net_remove(IPQ_PROC_FS_NAME);
+        proc_net_remove(&init_net, IPQ_PROC_FS_NAME);
 
         sock_release(ipqnl->sk_socket);
         mutex_lock(&ipqnl_mutex);
diff --git a/net/ipv4/netfilter/ipt_CLUSTERIP.c b/net/ipv4/netfilter/ipt_CLUSTERIP.c
index 69bd362b5fa2..50fc9e009fe4 100644
--- a/net/ipv4/netfilter/ipt_CLUSTERIP.c
+++ b/net/ipv4/netfilter/ipt_CLUSTERIP.c
@@ -25,6 +25,7 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_CLUSTERIP.h>
 #include <net/netfilter/nf_conntrack.h>
+#include <net/net_namespace.h>
 #include <net/checksum.h>
 
 #define CLUSTERIP_VERSION "0.8"
@@ -726,7 +727,7 @@ static int __init ipt_clusterip_init(void)
                 goto cleanup_target;
 
 #ifdef CONFIG_PROC_FS
-        clusterip_procdir = proc_mkdir("ipt_CLUSTERIP", proc_net);
+        clusterip_procdir = proc_mkdir("ipt_CLUSTERIP", init_net.proc_net);
         if (!clusterip_procdir) {
                 printk(KERN_ERR "CLUSTERIP: Unable to proc dir entry\n");
                 ret = -ENOMEM;
diff --git a/net/ipv4/netfilter/ipt_recent.c b/net/ipv4/netfilter/ipt_recent.c
index 6d0c0f7364ad..db2a79889f9a 100644
--- a/net/ipv4/netfilter/ipt_recent.c
+++ b/net/ipv4/netfilter/ipt_recent.c
@@ -24,6 +24,7 @@
 #include <linux/bitops.h>
 #include <linux/skbuff.h>
 #include <linux/inet.h>
+#include <net/net_namespace.h>
 
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter_ipv4/ipt_recent.h>
@@ -487,7 +488,7 @@ static int __init ipt_recent_init(void)
 #ifdef CONFIG_PROC_FS
         if (err)
                 return err;
-        proc_dir = proc_mkdir("ipt_recent", proc_net);
+        proc_dir = proc_mkdir("ipt_recent", init_net.proc_net);
         if (proc_dir == NULL) {
                 xt_unregister_match(&recent_match);
                 err = -ENOMEM;
@@ -501,7 +502,7 @@ static void __exit ipt_recent_exit(void)
         BUG_ON(!list_empty(&tables));
         xt_unregister_match(&recent_match);
 #ifdef CONFIG_PROC_FS
-        remove_proc_entry("ipt_recent", proc_net);
+        remove_proc_entry("ipt_recent", init_net.proc_net);
 #endif
 }
 
diff --git a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
index b3dd5de9a258..a5ae2eabf0f3 100644
--- a/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
+++ b/net/ipv4/netfilter/nf_conntrack_l3proto_ipv4_compat.c
@@ -11,6 +11,7 @@
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
 #include <linux/percpu.h>
+#include <net/net_namespace.h>
 
 #include <linux/netfilter.h>
 #include <net/netfilter/nf_conntrack_core.h>
@@ -408,16 +409,16 @@ int __init nf_conntrack_ipv4_compat_init(void)
 {
         struct proc_dir_entry *proc, *proc_exp, *proc_stat;
 
-        proc = proc_net_fops_create("ip_conntrack", 0440, &ct_file_ops);
+        proc = proc_net_fops_create(&init_net, "ip_conntrack", 0440, &ct_file_ops);
         if (!proc)
                 goto err1;
 
-        proc_exp = proc_net_fops_create("ip_conntrack_expect", 0440,
+        proc_exp = proc_net_fops_create(&init_net, "ip_conntrack_expect", 0440,
                                         &ip_exp_file_ops);
         if (!proc_exp)
                 goto err2;
 
-        proc_stat = create_proc_entry("ip_conntrack", S_IRUGO, proc_net_stat);
+        proc_stat = create_proc_entry("ip_conntrack", S_IRUGO, init_net.proc_net_stat);
         if (!proc_stat)
                 goto err3;
 
@@ -427,16 +428,16 @@ int __init nf_conntrack_ipv4_compat_init(void)
         return 0;
 
 err3:
-        proc_net_remove("ip_conntrack_expect");
+        proc_net_remove(&init_net, "ip_conntrack_expect");
 err2:
-        proc_net_remove("ip_conntrack");
+        proc_net_remove(&init_net, "ip_conntrack");
 err1:
         return -ENOMEM;
 }
 
 void __exit nf_conntrack_ipv4_compat_fini(void)
 {
-        remove_proc_entry("ip_conntrack", proc_net_stat);
-        proc_net_remove("ip_conntrack_expect");
-        proc_net_remove("ip_conntrack");
+        remove_proc_entry("ip_conntrack", init_net.proc_net_stat);
+        proc_net_remove(&init_net, "ip_conntrack_expect");
+        proc_net_remove(&init_net, "ip_conntrack");
 }
diff --git a/net/ipv4/proc.c b/net/ipv4/proc.c
index 986d1c83a000..95a8f8f2de71 100644
--- a/net/ipv4/proc.c
+++ b/net/ipv4/proc.c
@@ -34,6 +34,7 @@
  *              2 of the License, or (at your option) any later version.
  */
 #include <linux/types.h>
+#include <net/net_namespace.h>
 #include <net/icmp.h>
 #include <net/protocol.h>
 #include <net/tcp.h>
@@ -383,20 +384,20 @@ int __init ip_misc_proc_init(void)
 {
         int rc = 0;
 
-        if (!proc_net_fops_create("netstat", S_IRUGO, &netstat_seq_fops))
+        if (!proc_net_fops_create(&init_net, "netstat", S_IRUGO, &netstat_seq_fops))
                 goto out_netstat;
 
-        if (!proc_net_fops_create("snmp", S_IRUGO, &snmp_seq_fops))
+        if (!proc_net_fops_create(&init_net, "snmp", S_IRUGO, &snmp_seq_fops))
                 goto out_snmp;
 
-        if (!proc_net_fops_create("sockstat", S_IRUGO, &sockstat_seq_fops))
+        if (!proc_net_fops_create(&init_net, "sockstat", S_IRUGO, &sockstat_seq_fops))
                 goto out_sockstat;
 out:
         return rc;
 out_sockstat:
-        proc_net_remove("snmp");
+        proc_net_remove(&init_net, "snmp");
 out_snmp:
-        proc_net_remove("netstat");
+        proc_net_remove(&init_net, "netstat");
 out_netstat:
         rc = -ENOMEM;
         goto out;
diff --git a/net/ipv4/raw.c b/net/ipv4/raw.c
index c6d71526f625..216e01b0f44a 100644
--- a/net/ipv4/raw.c
+++ b/net/ipv4/raw.c
@@ -59,6 +59,7 @@
 #include <linux/in_route.h>
 #include <linux/route.h>
 #include <linux/skbuff.h>
+#include <net/net_namespace.h>
 #include <net/dst.h>
 #include <net/sock.h>
 #include <linux/gfp.h>
@@ -928,13 +929,13 @@ static const struct file_operations raw_seq_fops = {
 
 int __init raw_proc_init(void)
 {
-        if (!proc_net_fops_create("raw", S_IRUGO, &raw_seq_fops))
+        if (!proc_net_fops_create(&init_net, "raw", S_IRUGO, &raw_seq_fops))
                 return -ENOMEM;
         return 0;
 }
 
 void __init raw_proc_exit(void)
 {
-        proc_net_remove("raw");
+        proc_net_remove(&init_net, "raw");
 }
 #endif /* CONFIG_PROC_FS */
diff --git a/net/ipv4/route.c b/net/ipv4/route.c
index c7ca94bd152c..efd2a9202d68 100644
--- a/net/ipv4/route.c
+++ b/net/ipv4/route.c
@@ -91,6 +91,7 @@
 #include <linux/jhash.h>
 #include <linux/rcupdate.h>
 #include <linux/times.h>
+#include <net/net_namespace.h>
 #include <net/protocol.h>
 #include <net/ip.h>
 #include <net/route.h>
@@ -3011,15 +3012,15 @@ int __init ip_rt_init(void)
 #ifdef CONFIG_PROC_FS
         {
         struct proc_dir_entry *rtstat_pde = NULL; /* keep gcc happy */
-        if (!proc_net_fops_create("rt_cache", S_IRUGO, &rt_cache_seq_fops) ||
+        if (!proc_net_fops_create(&init_net, "rt_cache", S_IRUGO, &rt_cache_seq_fops) ||
             !(rtstat_pde = create_proc_entry("rt_cache", S_IRUGO,
-                                             proc_net_stat))) {
+                                             init_net.proc_net_stat))) {
                 return -ENOMEM;
         }
         rtstat_pde->proc_fops = &rt_cpu_seq_fops;
         }
 #ifdef CONFIG_NET_CLS_ROUTE
-        create_proc_read_entry("rt_acct", 0, proc_net, ip_rt_acct_read, NULL);
+        create_proc_read_entry("rt_acct", 0, init_net.proc_net, ip_rt_acct_read, NULL);
 #endif
 #endif
 #ifdef CONFIG_XFRM
diff --git a/net/ipv4/tcp_ipv4.c b/net/ipv4/tcp_ipv4.c
index e089a978e128..8855e640e958 100644
--- a/net/ipv4/tcp_ipv4.c
+++ b/net/ipv4/tcp_ipv4.c
@@ -62,6 +62,7 @@
 #include <linux/init.h>
 #include <linux/times.h>
 
+#include <net/net_namespace.h>
 #include <net/icmp.h>
 #include <net/inet_hashtables.h>
 #include <net/tcp.h>
@@ -2249,7 +2250,7 @@ int tcp_proc_register(struct tcp_seq_afinfo *afinfo)
         afinfo->seq_fops->llseek        = seq_lseek;
         afinfo->seq_fops->release       = seq_release_private;
 
-        p = proc_net_fops_create(afinfo->name, S_IRUGO, afinfo->seq_fops);
+        p = proc_net_fops_create(&init_net, afinfo->name, S_IRUGO, afinfo->seq_fops);
         if (p)
                 p->data = afinfo;
         else
@@ -2261,7 +2262,7 @@ void tcp_proc_unregister(struct tcp_seq_afinfo *afinfo)
 {
         if (!afinfo)
                 return;
-        proc_net_remove(afinfo->name);
+        proc_net_remove(&init_net, afinfo->name);
         memset(afinfo->seq_fops, 0, sizeof(*afinfo->seq_fops));
 }
 
diff --git a/net/ipv4/tcp_probe.c b/net/ipv4/tcp_probe.c
index b76398d1b454..87dd5bff315f 100644
--- a/net/ipv4/tcp_probe.c
+++ b/net/ipv4/tcp_probe.c
@@ -26,6 +26,7 @@
 #include <linux/module.h>
 #include <linux/ktime.h>
 #include <linux/time.h>
+#include <net/net_namespace.h>
 
 #include <net/tcp.h>
 
@@ -228,7 +229,7 @@ static __init int tcpprobe_init(void)
         if (!tcp_probe.log)
                 goto err0;
 
-        if (!proc_net_fops_create(procname, S_IRUSR, &tcpprobe_fops))
+        if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &tcpprobe_fops))
                 goto err0;
 
         ret = register_jprobe(&tcp_jprobe);
@@ -238,7 +239,7 @@ static __init int tcpprobe_init(void)
         pr_info("TCP probe registered (port=%d)\n", port);
         return 0;
  err1:
-        proc_net_remove(procname);
+        proc_net_remove(&init_net, procname);
  err0:
         kfree(tcp_probe.log);
         return ret;
@@ -247,7 +248,7 @@ module_init(tcpprobe_init);
 
 static __exit void tcpprobe_exit(void)
 {
-        proc_net_remove(procname);
+        proc_net_remove(&init_net, procname);
         unregister_jprobe(&tcp_jprobe);
         kfree(tcp_probe.log);
 }
diff --git a/net/ipv4/udp.c b/net/ipv4/udp.c
index a581b543bff7..ef4d901ee9ad 100644
--- a/net/ipv4/udp.c
+++ b/net/ipv4/udp.c
@@ -98,6 +98,7 @@
 #include <linux/skbuff.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <net/net_namespace.h>
 #include <net/icmp.h>
 #include <net/route.h>
 #include <net/checksum.h>
@@ -1566,7 +1567,7 @@ int udp_proc_register(struct udp_seq_afinfo *afinfo)
         afinfo->seq_fops->llseek        = seq_lseek;
         afinfo->seq_fops->release       = seq_release_private;
 
-        p = proc_net_fops_create(afinfo->name, S_IRUGO, afinfo->seq_fops);
+        p = proc_net_fops_create(&init_net, afinfo->name, S_IRUGO, afinfo->seq_fops);
         if (p)
                 p->data = afinfo;
         else
@@ -1578,7 +1579,7 @@ void udp_proc_unregister(struct udp_seq_afinfo *afinfo)
 {
         if (!afinfo)
                 return;
-        proc_net_remove(afinfo->name);
+        proc_net_remove(&init_net, afinfo->name);
         memset(afinfo->seq_fops, 0, sizeof(*afinfo->seq_fops));
 }