aboutsummaryrefslogtreecommitdiffstats
path: root/net/ipv6/proc.c
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2007-09-12 06:01:34 -0400
committerDavid S. Miller <davem@sunset.davemloft.net>2007-10-10 19:49:06 -0400
commit457c4cbc5a3dde259d2a1f15d5f9785290397267 (patch)
treea2ceee88780cbce27433b9a4434b3e9251efd81a /net/ipv6/proc.c
parent07feaebfcc10cd35e745c7073667935246494bee (diff)
[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>
Diffstat (limited to 'net/ipv6/proc.c')
-rw-r--r--net/ipv6/proc.c17
1 files changed, 9 insertions, 8 deletions
diff --git a/net/ipv6/proc.c b/net/ipv6/proc.c
index 920dc9cf6a84..a712a2289484 100644
--- a/net/ipv6/proc.c
+++ b/net/ipv6/proc.c
@@ -23,6 +23,7 @@
23#include <linux/proc_fs.h> 23#include <linux/proc_fs.h>
24#include <linux/seq_file.h> 24#include <linux/seq_file.h>
25#include <linux/stddef.h> 25#include <linux/stddef.h>
26#include <net/net_namespace.h>
26#include <net/ip.h> 27#include <net/ip.h>
27#include <net/sock.h> 28#include <net/sock.h>
28#include <net/tcp.h> 29#include <net/tcp.h>
@@ -231,22 +232,22 @@ int __init ipv6_misc_proc_init(void)
231{ 232{
232 int rc = 0; 233 int rc = 0;
233 234
234 if (!proc_net_fops_create("snmp6", S_IRUGO, &snmp6_seq_fops)) 235 if (!proc_net_fops_create(&init_net, "snmp6", S_IRUGO, &snmp6_seq_fops))
235 goto proc_snmp6_fail; 236 goto proc_snmp6_fail;
236 237
237 proc_net_devsnmp6 = proc_mkdir("dev_snmp6", proc_net); 238 proc_net_devsnmp6 = proc_mkdir("dev_snmp6", init_net.proc_net);
238 if (!proc_net_devsnmp6) 239 if (!proc_net_devsnmp6)
239 goto proc_dev_snmp6_fail; 240 goto proc_dev_snmp6_fail;
240 241
241 if (!proc_net_fops_create("sockstat6", S_IRUGO, &sockstat6_seq_fops)) 242 if (!proc_net_fops_create(&init_net, "sockstat6", S_IRUGO, &sockstat6_seq_fops))
242 goto proc_sockstat6_fail; 243 goto proc_sockstat6_fail;
243out: 244out:
244 return rc; 245 return rc;
245 246
246proc_sockstat6_fail: 247proc_sockstat6_fail:
247 proc_net_remove("dev_snmp6"); 248 proc_net_remove(&init_net, "dev_snmp6");
248proc_dev_snmp6_fail: 249proc_dev_snmp6_fail:
249 proc_net_remove("snmp6"); 250 proc_net_remove(&init_net, "snmp6");
250proc_snmp6_fail: 251proc_snmp6_fail:
251 rc = -ENOMEM; 252 rc = -ENOMEM;
252 goto out; 253 goto out;
@@ -254,8 +255,8 @@ proc_snmp6_fail:
254 255
255void ipv6_misc_proc_exit(void) 256void ipv6_misc_proc_exit(void)
256{ 257{
257 proc_net_remove("sockstat6"); 258 proc_net_remove(&init_net, "sockstat6");
258 proc_net_remove("dev_snmp6"); 259 proc_net_remove(&init_net, "dev_snmp6");
259 proc_net_remove("snmp6"); 260 proc_net_remove(&init_net, "snmp6");
260} 261}
261 262