aboutsummaryrefslogtreecommitdiffstats
path: root/net/key/af_key.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/key/af_key.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/key/af_key.c')
-rw-r--r--net/key/af_key.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c
index 0241fff95137..5b802bbb856e 100644
--- a/net/key/af_key.c
+++ b/net/key/af_key.c
@@ -26,6 +26,7 @@
26#include <linux/in6.h> 26#include <linux/in6.h>
27#include <linux/proc_fs.h> 27#include <linux/proc_fs.h>
28#include <linux/init.h> 28#include <linux/init.h>
29#include <net/net_namespace.h>
29#include <net/xfrm.h> 30#include <net/xfrm.h>
30 31
31#include <net/sock.h> 32#include <net/sock.h>
@@ -3776,7 +3777,7 @@ static struct xfrm_mgr pfkeyv2_mgr =
3776static void __exit ipsec_pfkey_exit(void) 3777static void __exit ipsec_pfkey_exit(void)
3777{ 3778{
3778 xfrm_unregister_km(&pfkeyv2_mgr); 3779 xfrm_unregister_km(&pfkeyv2_mgr);
3779 remove_proc_entry("net/pfkey", NULL); 3780 remove_proc_entry("pfkey", init_net.proc_net);
3780 sock_unregister(PF_KEY); 3781 sock_unregister(PF_KEY);
3781 proto_unregister(&key_proto); 3782 proto_unregister(&key_proto);
3782} 3783}
@@ -3793,7 +3794,7 @@ static int __init ipsec_pfkey_init(void)
3793 goto out_unregister_key_proto; 3794 goto out_unregister_key_proto;
3794#ifdef CONFIG_PROC_FS 3795#ifdef CONFIG_PROC_FS
3795 err = -ENOMEM; 3796 err = -ENOMEM;
3796 if (create_proc_read_entry("net/pfkey", 0, NULL, pfkey_read_proc, NULL) == NULL) 3797 if (create_proc_read_entry("pfkey", 0, init_net.proc_net, pfkey_read_proc, NULL) == NULL)
3797 goto out_sock_unregister; 3798 goto out_sock_unregister;
3798#endif 3799#endif
3799 err = xfrm_register_km(&pfkeyv2_mgr); 3800 err = xfrm_register_km(&pfkeyv2_mgr);