diff options
author | Eric W. Biederman <ebiederm@xmission.com> | 2007-11-30 07:55:42 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-01-28 17:55:18 -0500 |
commit | 95bdfccb2bf4ea21c0065772c6a2c75cbaf6ad0d (patch) | |
tree | 779993b29b8e348e14497496f3c9d318fb0b0d0e /net/sysctl_net.c | |
parent | e51b6ba077791f2f8c876022b37419be7a2ceec3 (diff) |
[NET]: Implement the per network namespace sysctl infrastructure
The user interface is: register_net_sysctl_table and
unregister_net_sysctl_table. Very much like the current
interface except there is a network namespace parameter.
With this any sysctl registered with register_net_sysctl_table
will only show up to tasks in the same network namespace.
All other sysctls continue to be globally visible.
Signed-off-by: Eric W. Biederman <ebiederm@xmission.com>
Cc: Serge Hallyn <serue@us.ibm.com>
Cc: Daniel Lezcano <dlezcano@fr.ibm.com>
Cc: Cedric Le Goater <clg@fr.ibm.com>
Cc: Pavel Emelyanov <xemul@openvz.org>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sysctl_net.c')
-rw-r--r-- | net/sysctl_net.c | 57 |
1 files changed, 57 insertions, 0 deletions
diff --git a/net/sysctl_net.c b/net/sysctl_net.c index cd4eafbab1b8..c50c793aa7f0 100644 --- a/net/sysctl_net.c +++ b/net/sysctl_net.c | |||
@@ -14,6 +14,7 @@ | |||
14 | 14 | ||
15 | #include <linux/mm.h> | 15 | #include <linux/mm.h> |
16 | #include <linux/sysctl.h> | 16 | #include <linux/sysctl.h> |
17 | #include <linux/nsproxy.h> | ||
17 | 18 | ||
18 | #include <net/sock.h> | 19 | #include <net/sock.h> |
19 | 20 | ||
@@ -54,3 +55,59 @@ struct ctl_table net_table[] = { | |||
54 | #endif | 55 | #endif |
55 | { 0 }, | 56 | { 0 }, |
56 | }; | 57 | }; |
58 | |||
59 | static struct list_head * | ||
60 | net_ctl_header_lookup(struct ctl_table_root *root, struct nsproxy *namespaces) | ||
61 | { | ||
62 | return &namespaces->net_ns->sysctl_table_headers; | ||
63 | } | ||
64 | |||
65 | static struct ctl_table_root net_sysctl_root = { | ||
66 | .lookup = net_ctl_header_lookup, | ||
67 | }; | ||
68 | |||
69 | static int sysctl_net_init(struct net *net) | ||
70 | { | ||
71 | INIT_LIST_HEAD(&net->sysctl_table_headers); | ||
72 | return 0; | ||
73 | } | ||
74 | |||
75 | static void sysctl_net_exit(struct net *net) | ||
76 | { | ||
77 | WARN_ON(!list_empty(&net->sysctl_table_headers)); | ||
78 | return; | ||
79 | } | ||
80 | |||
81 | static struct pernet_operations sysctl_pernet_ops = { | ||
82 | .init = sysctl_net_init, | ||
83 | .exit = sysctl_net_exit, | ||
84 | }; | ||
85 | |||
86 | static __init int sysctl_init(void) | ||
87 | { | ||
88 | int ret; | ||
89 | ret = register_pernet_subsys(&sysctl_pernet_ops); | ||
90 | if (ret) | ||
91 | goto out; | ||
92 | register_sysctl_root(&net_sysctl_root); | ||
93 | out: | ||
94 | return ret; | ||
95 | } | ||
96 | subsys_initcall(sysctl_init); | ||
97 | |||
98 | struct ctl_table_header *register_net_sysctl_table(struct net *net, | ||
99 | const struct ctl_path *path, struct ctl_table *table) | ||
100 | { | ||
101 | struct nsproxy namespaces; | ||
102 | namespaces = *current->nsproxy; | ||
103 | namespaces.net_ns = net; | ||
104 | return __register_sysctl_paths(&net_sysctl_root, | ||
105 | &namespaces, path, table); | ||
106 | } | ||
107 | EXPORT_SYMBOL_GPL(register_net_sysctl_table); | ||
108 | |||
109 | void unregister_net_sysctl_table(struct ctl_table_header *header) | ||
110 | { | ||
111 | return unregister_sysctl_table(header); | ||
112 | } | ||
113 | EXPORT_SYMBOL_GPL(unregister_net_sysctl_table); | ||