[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
@@ -17,6 +17,7 @@
|
||||
#include <linux/fs.h>
|
||||
#endif
|
||||
#include <linux/isdnif.h>
|
||||
#include <net/net_namespace.h>
|
||||
#include "isdn_divert.h"
|
||||
|
||||
|
||||
@@ -284,12 +285,12 @@ divert_dev_init(void)
|
||||
init_waitqueue_head(&rd_queue);
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
isdn_proc_entry = proc_mkdir("net/isdn", NULL);
|
||||
isdn_proc_entry = proc_mkdir("isdn", init_net.proc_net);
|
||||
if (!isdn_proc_entry)
|
||||
return (-1);
|
||||
isdn_divert_entry = create_proc_entry("divert", S_IFREG | S_IRUGO, isdn_proc_entry);
|
||||
if (!isdn_divert_entry) {
|
||||
remove_proc_entry("net/isdn", NULL);
|
||||
remove_proc_entry("isdn", init_net.proc_net);
|
||||
return (-1);
|
||||
}
|
||||
isdn_divert_entry->proc_fops = &isdn_fops;
|
||||
@@ -309,7 +310,7 @@ divert_dev_deinit(void)
|
||||
|
||||
#ifdef CONFIG_PROC_FS
|
||||
remove_proc_entry("divert", isdn_proc_entry);
|
||||
remove_proc_entry("net/isdn", NULL);
|
||||
remove_proc_entry("isdn", init_net.proc_net);
|
||||
#endif /* CONFIG_PROC_FS */
|
||||
|
||||
return (0);
|
||||
|
Reference in New Issue
Block a user