[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>
This commit is contained in:

committed by
David S. Miller

parent
07feaebfcc
commit
457c4cbc5a
@@ -83,6 +83,7 @@
|
||||
|
||||
#include <net/ip.h>
|
||||
#include <net/arp.h>
|
||||
#include <net/net_namespace.h>
|
||||
|
||||
#include <linux/bpqether.h>
|
||||
|
||||
@@ -594,7 +595,7 @@ static int bpq_device_event(struct notifier_block *this,unsigned long event, voi
|
||||
static int __init bpq_init_driver(void)
|
||||
{
|
||||
#ifdef CONFIG_PROC_FS
|
||||
if (!proc_net_fops_create("bpqether", S_IRUGO, &bpq_info_fops)) {
|
||||
if (!proc_net_fops_create(&init_net, "bpqether", S_IRUGO, &bpq_info_fops)) {
|
||||
printk(KERN_ERR
|
||||
"bpq: cannot create /proc/net/bpqether entry.\n");
|
||||
return -ENOENT;
|
||||
@@ -618,7 +619,7 @@ static void __exit bpq_cleanup_driver(void)
|
||||
|
||||
unregister_netdevice_notifier(&bpq_dev_notifier);
|
||||
|
||||
proc_net_remove("bpqether");
|
||||
proc_net_remove(&init_net, "bpqether");
|
||||
|
||||
rtnl_lock();
|
||||
while (!list_empty(&bpq_devices)) {
|
||||
|
@@ -174,6 +174,7 @@
|
||||
#include <linux/seq_file.h>
|
||||
#include <linux/bitops.h>
|
||||
|
||||
#include <net/net_namespace.h>
|
||||
#include <net/ax25.h>
|
||||
|
||||
#include <asm/irq.h>
|
||||
@@ -2114,7 +2115,7 @@ static int __init scc_init_driver (void)
|
||||
}
|
||||
rtnl_unlock();
|
||||
|
||||
proc_net_fops_create("z8530drv", 0, &scc_net_seq_fops);
|
||||
proc_net_fops_create(&init_net, "z8530drv", 0, &scc_net_seq_fops);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -2169,7 +2170,7 @@ static void __exit scc_cleanup_driver(void)
|
||||
if (Vector_Latch)
|
||||
release_region(Vector_Latch, 1);
|
||||
|
||||
proc_net_remove("z8530drv");
|
||||
proc_net_remove(&init_net, "z8530drv");
|
||||
}
|
||||
|
||||
MODULE_AUTHOR("Joerg Reuter <jreuter@yaina.de>");
|
||||
|
@@ -65,6 +65,7 @@
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/proc_fs.h>
|
||||
#include <linux/seq_file.h>
|
||||
#include <net/net_namespace.h>
|
||||
|
||||
#include <asm/uaccess.h>
|
||||
#include <linux/init.h>
|
||||
@@ -1142,7 +1143,7 @@ static int __init yam_init_driver(void)
|
||||
yam_timer.expires = jiffies + HZ / 100;
|
||||
add_timer(&yam_timer);
|
||||
|
||||
proc_net_fops_create("yam", S_IRUGO, &yam_info_fops);
|
||||
proc_net_fops_create(&init_net, "yam", S_IRUGO, &yam_info_fops);
|
||||
return 0;
|
||||
error:
|
||||
while (--i >= 0) {
|
||||
@@ -1174,7 +1175,7 @@ static void __exit yam_cleanup_driver(void)
|
||||
kfree(p);
|
||||
}
|
||||
|
||||
proc_net_remove("yam");
|
||||
proc_net_remove(&init_net, "yam");
|
||||
}
|
||||
|
||||
/* --------------------------------------------------------------------- */
|
||||
|
Reference in New Issue
Block a user