[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
@ -29,6 +29,7 @@
|
||||
#include <linux/seq_file.h>
|
||||
#include <linux/smp_lock.h>
|
||||
|
||||
#include <net/net_namespace.h>
|
||||
#include <asm/io.h>
|
||||
|
||||
#define PROC_STATS_FORMAT "%30s: %12lu\n"
|
||||
@ -287,7 +288,7 @@ static const struct file_operations wandev_fops = {
|
||||
int __init wanrouter_proc_init(void)
|
||||
{
|
||||
struct proc_dir_entry *p;
|
||||
proc_router = proc_mkdir(ROUTER_NAME, proc_net);
|
||||
proc_router = proc_mkdir(ROUTER_NAME, init_net.proc_net);
|
||||
if (!proc_router)
|
||||
goto fail;
|
||||
|
||||
@ -303,7 +304,7 @@ int __init wanrouter_proc_init(void)
|
||||
fail_stat:
|
||||
remove_proc_entry("config", proc_router);
|
||||
fail_config:
|
||||
remove_proc_entry(ROUTER_NAME, proc_net);
|
||||
remove_proc_entry(ROUTER_NAME, init_net.proc_net);
|
||||
fail:
|
||||
return -ENOMEM;
|
||||
}
|
||||
@ -316,7 +317,7 @@ void wanrouter_proc_cleanup(void)
|
||||
{
|
||||
remove_proc_entry("config", proc_router);
|
||||
remove_proc_entry("status", proc_router);
|
||||
remove_proc_entry(ROUTER_NAME, proc_net);
|
||||
remove_proc_entry(ROUTER_NAME, init_net.proc_net);
|
||||
}
|
||||
|
||||
/*
|
||||
|
Reference in New Issue
Block a user