diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2007-09-12 06:01:34 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-10-10 19:49:06 -0400 |
commit | 457c4cbc5a3dde259d2a1f15d5f9785290397267 (patch) | |
tree | a2ceee88780cbce27433b9a4434b3e9251efd81a /net/ipv4/tcp_probe.c | |
parent | 07feaebfcc10cd35e745c7073667935246494bee (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/ipv4/tcp_probe.c')
-rw-r--r-- | net/ipv4/tcp_probe.c | 7 |
1 files changed, 4 insertions, 3 deletions
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 @@ | |||
26 | #include <linux/module.h> | 26 | #include <linux/module.h> |
27 | #include <linux/ktime.h> | 27 | #include <linux/ktime.h> |
28 | #include <linux/time.h> | 28 | #include <linux/time.h> |
29 | #include <net/net_namespace.h> | ||
29 | 30 | ||
30 | #include <net/tcp.h> | 31 | #include <net/tcp.h> |
31 | 32 | ||
@@ -228,7 +229,7 @@ static __init int tcpprobe_init(void) | |||
228 | if (!tcp_probe.log) | 229 | if (!tcp_probe.log) |
229 | goto err0; | 230 | goto err0; |
230 | 231 | ||
231 | if (!proc_net_fops_create(procname, S_IRUSR, &tcpprobe_fops)) | 232 | if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &tcpprobe_fops)) |
232 | goto err0; | 233 | goto err0; |
233 | 234 | ||
234 | ret = register_jprobe(&tcp_jprobe); | 235 | ret = register_jprobe(&tcp_jprobe); |
@@ -238,7 +239,7 @@ static __init int tcpprobe_init(void) | |||
238 | pr_info("TCP probe registered (port=%d)\n", port); | 239 | pr_info("TCP probe registered (port=%d)\n", port); |
239 | return 0; | 240 | return 0; |
240 | err1: | 241 | err1: |
241 | proc_net_remove(procname); | 242 | proc_net_remove(&init_net, procname); |
242 | err0: | 243 | err0: |
243 | kfree(tcp_probe.log); | 244 | kfree(tcp_probe.log); |
244 | return ret; | 245 | return ret; |
@@ -247,7 +248,7 @@ module_init(tcpprobe_init); | |||
247 | 248 | ||
248 | static __exit void tcpprobe_exit(void) | 249 | static __exit void tcpprobe_exit(void) |
249 | { | 250 | { |
250 | proc_net_remove(procname); | 251 | proc_net_remove(&init_net, procname); |
251 | unregister_jprobe(&tcp_jprobe); | 252 | unregister_jprobe(&tcp_jprobe); |
252 | kfree(tcp_probe.log); | 253 | kfree(tcp_probe.log); |
253 | } | 254 | } |