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/dccp | |
| 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/dccp')
| -rw-r--r-- | net/dccp/probe.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/dccp/probe.c b/net/dccp/probe.c index bae10b0f2f..7053bb827b 100644 --- a/net/dccp/probe.c +++ b/net/dccp/probe.c | |||
| @@ -30,6 +30,7 @@ | |||
| 30 | #include <linux/module.h> | 30 | #include <linux/module.h> |
| 31 | #include <linux/kfifo.h> | 31 | #include <linux/kfifo.h> |
| 32 | #include <linux/vmalloc.h> | 32 | #include <linux/vmalloc.h> |
| 33 | #include <net/net_namespace.h> | ||
| 33 | 34 | ||
| 34 | #include "dccp.h" | 35 | #include "dccp.h" |
| 35 | #include "ccid.h" | 36 | #include "ccid.h" |
| @@ -168,7 +169,7 @@ static __init int dccpprobe_init(void) | |||
| 168 | if (IS_ERR(dccpw.fifo)) | 169 | if (IS_ERR(dccpw.fifo)) |
| 169 | return PTR_ERR(dccpw.fifo); | 170 | return PTR_ERR(dccpw.fifo); |
| 170 | 171 | ||
| 171 | if (!proc_net_fops_create(procname, S_IRUSR, &dccpprobe_fops)) | 172 | if (!proc_net_fops_create(&init_net, procname, S_IRUSR, &dccpprobe_fops)) |
| 172 | goto err0; | 173 | goto err0; |
| 173 | 174 | ||
| 174 | ret = register_jprobe(&dccp_send_probe); | 175 | ret = register_jprobe(&dccp_send_probe); |
| @@ -178,7 +179,7 @@ static __init int dccpprobe_init(void) | |||
| 178 | pr_info("DCCP watch registered (port=%d)\n", port); | 179 | pr_info("DCCP watch registered (port=%d)\n", port); |
| 179 | return 0; | 180 | return 0; |
| 180 | err1: | 181 | err1: |
| 181 | proc_net_remove(procname); | 182 | proc_net_remove(&init_net, procname); |
| 182 | err0: | 183 | err0: |
| 183 | kfifo_free(dccpw.fifo); | 184 | kfifo_free(dccpw.fifo); |
| 184 | return ret; | 185 | return ret; |
| @@ -188,7 +189,7 @@ module_init(dccpprobe_init); | |||
| 188 | static __exit void dccpprobe_exit(void) | 189 | static __exit void dccpprobe_exit(void) |
| 189 | { | 190 | { |
| 190 | kfifo_free(dccpw.fifo); | 191 | kfifo_free(dccpw.fifo); |
| 191 | proc_net_remove(procname); | 192 | proc_net_remove(&init_net, procname); |
| 192 | unregister_jprobe(&dccp_send_probe); | 193 | unregister_jprobe(&dccp_send_probe); |
| 193 | 194 | ||
| 194 | } | 195 | } |
