aboutsummaryrefslogtreecommitdiffstats
path: root/net/packet
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/packet
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/packet')
-rw-r--r--net/packet/af_packet.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/net/packet/af_packet.c b/net/packet/af_packet.c
index 9c26dd9ee649..56502292f24c 100644
--- a/net/packet/af_packet.c
+++ b/net/packet/af_packet.c
@@ -61,6 +61,7 @@
61#include <linux/wireless.h> 61#include <linux/wireless.h>
62#include <linux/kernel.h> 62#include <linux/kernel.h>
63#include <linux/kmod.h> 63#include <linux/kmod.h>
64#include <net/net_namespace.h>
64#include <net/ip.h> 65#include <net/ip.h>
65#include <net/protocol.h> 66#include <net/protocol.h>
66#include <linux/skbuff.h> 67#include <linux/skbuff.h>
@@ -1951,7 +1952,7 @@ static const struct file_operations packet_seq_fops = {
1951 1952
1952static void __exit packet_exit(void) 1953static void __exit packet_exit(void)
1953{ 1954{
1954 proc_net_remove("packet"); 1955 proc_net_remove(&init_net, "packet");
1955 unregister_netdevice_notifier(&packet_netdev_notifier); 1956 unregister_netdevice_notifier(&packet_netdev_notifier);
1956 sock_unregister(PF_PACKET); 1957 sock_unregister(PF_PACKET);
1957 proto_unregister(&packet_proto); 1958 proto_unregister(&packet_proto);
@@ -1966,7 +1967,7 @@ static int __init packet_init(void)
1966 1967
1967 sock_register(&packet_family_ops); 1968 sock_register(&packet_family_ops);
1968 register_netdevice_notifier(&packet_netdev_notifier); 1969 register_netdevice_notifier(&packet_netdev_notifier);
1969 proc_net_fops_create("packet", 0, &packet_seq_fops); 1970 proc_net_fops_create(&init_net, "packet", 0, &packet_seq_fops);
1970out: 1971out:
1971 return rc; 1972 return rc;
1972} 1973}