aboutsummaryrefslogtreecommitdiffstats
path: root/net/unix
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/unix
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/unix')
-rw-r--r--net/unix/af_unix.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index a05c34260e70..2386090c3a16 100644
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -103,6 +103,7 @@
103#include <asm/uaccess.h> 103#include <asm/uaccess.h>
104#include <linux/skbuff.h> 104#include <linux/skbuff.h>
105#include <linux/netdevice.h> 105#include <linux/netdevice.h>
106#include <net/net_namespace.h>
106#include <net/sock.h> 107#include <net/sock.h>
107#include <net/tcp_states.h> 108#include <net/tcp_states.h>
108#include <net/af_unix.h> 109#include <net/af_unix.h>
@@ -2135,7 +2136,7 @@ static int __init af_unix_init(void)
2135 2136
2136 sock_register(&unix_family_ops); 2137 sock_register(&unix_family_ops);
2137#ifdef CONFIG_PROC_FS 2138#ifdef CONFIG_PROC_FS
2138 proc_net_fops_create("unix", 0, &unix_seq_fops); 2139 proc_net_fops_create(&init_net, "unix", 0, &unix_seq_fops);
2139#endif 2140#endif
2140 unix_sysctl_register(); 2141 unix_sysctl_register();
2141out: 2142out:
@@ -2146,7 +2147,7 @@ static void __exit af_unix_exit(void)
2146{ 2147{
2147 sock_unregister(PF_UNIX); 2148 sock_unregister(PF_UNIX);
2148 unix_sysctl_unregister(); 2149 unix_sysctl_unregister();
2149 proc_net_remove("unix"); 2150 proc_net_remove(&init_net, "unix");
2150 proto_unregister(&unix_proto); 2151 proto_unregister(&unix_proto);
2151} 2152}
2152 2153