[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
@@ -20,6 +20,7 @@
|
||||
#include <linux/init.h>
|
||||
#include <linux/proc_fs.h>
|
||||
#include <linux/seq_file.h>
|
||||
#include <net/net_namespace.h>
|
||||
#include <net/sock.h>
|
||||
#include <net/x25.h>
|
||||
|
||||
@@ -301,7 +302,7 @@ int __init x25_proc_init(void)
|
||||
struct proc_dir_entry *p;
|
||||
int rc = -ENOMEM;
|
||||
|
||||
x25_proc_dir = proc_mkdir("x25", proc_net);
|
||||
x25_proc_dir = proc_mkdir("x25", init_net.proc_net);
|
||||
if (!x25_proc_dir)
|
||||
goto out;
|
||||
|
||||
@@ -328,7 +329,7 @@ out_forward:
|
||||
out_socket:
|
||||
remove_proc_entry("route", x25_proc_dir);
|
||||
out_route:
|
||||
remove_proc_entry("x25", proc_net);
|
||||
remove_proc_entry("x25", init_net.proc_net);
|
||||
goto out;
|
||||
}
|
||||
|
||||
@@ -337,7 +338,7 @@ void __exit x25_proc_exit(void)
|
||||
remove_proc_entry("forward", x25_proc_dir);
|
||||
remove_proc_entry("route", x25_proc_dir);
|
||||
remove_proc_entry("socket", x25_proc_dir);
|
||||
remove_proc_entry("x25", proc_net);
|
||||
remove_proc_entry("x25", init_net.proc_net);
|
||||
}
|
||||
|
||||
#else /* CONFIG_PROC_FS */
|
||||
|
Reference in New Issue
Block a user