adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-29 04:06:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

[UNIX]: Make the unix sysctl tables per-namespace

Browse source 
This is the core.

 * add the ctl_table_header on the struct net;
 * make the unix_sysctl_register and _unregister clone the table;
 * moves calls to them into per-net init and exit callbacks;
 * move the .data pointer in the proper place.

Signed-off-by: Pavel Emelyanov <xemul@openvz.org>
Acked-by: Eric W. Biederman <ebiederm@xmission.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Pavel Emelyanov 2007-12-01 23:51:01 +11:00 committed by David S. Miller
parent 1d430b913c
commit 1597fbc0fa
3 changed files with 31 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
include/net/net_namespace.h
View file

@ -11,6 +11,8 @@
struct proc_dir_entry; struct proc_dir_entry;
struct net_device; struct net_device;
struct sock; struct sock;
struct ctl_table_header;
struct net { struct net {
atomic_t count; /* To decided when the network atomic_t count; /* To decided when the network
* namespace should be freed. * namespace should be freed.
@ -41,6 +43,7 @@ struct net {
/* unix sockets */ /* unix sockets */
int sysctl_unix_max_dgram_qlen; int sysctl_unix_max_dgram_qlen;
struct ctl_table_header *unix_ctl;
}; };
#ifdef CONFIG_NET #ifdef CONFIG_NET

9
net/unix/af_unix.c
View file

@ -2139,10 +2139,14 @@ static int unix_net_init(struct net *net)
int error = -ENOMEM; int error = -ENOMEM;
net->sysctl_unix_max_dgram_qlen = 10; net->sysctl_unix_max_dgram_qlen = 10;
if (unix_sysctl_register(net))
goto out;
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
if (!proc_net_fops_create(net, "unix", 0, &unix_seq_fops)) if (!proc_net_fops_create(net, "unix", 0, &unix_seq_fops)) {
unix_sysctl_unregister(net);
goto out; goto out;
}
#endif #endif
error = 0; error = 0;
out: out:
@ -2151,6 +2155,7 @@ out:
static void unix_net_exit(struct net *net) static void unix_net_exit(struct net *net)
{ {
unix_sysctl_unregister(net);
proc_net_remove(net, "unix"); proc_net_remove(net, "unix");
} }
@ -2175,7 +2180,6 @@ static int __init af_unix_init(void)
sock_register(&unix_family_ops); sock_register(&unix_family_ops);
register_pernet_subsys(&unix_net_ops); register_pernet_subsys(&unix_net_ops);
unix_sysctl_register(&init_net);
out: out:
return rc; return rc;
} }
@ -2183,7 +2187,6 @@ out:
static void __exit af_unix_exit(void) static void __exit af_unix_exit(void)
{ {
sock_unregister(PF_UNIX); sock_unregister(PF_UNIX);
unix_sysctl_unregister(&init_net);
proto_unregister(&unix_proto); proto_unregister(&unix_proto);
unregister_pernet_subsys(&unix_net_ops); unregister_pernet_subsys(&unix_net_ops);
} }

27
net/unix/sysctl_net_unix.c
View file

@ -32,16 +32,33 @@ static struct ctl_path unix_path[] = {
{ }, { },
}; };
static struct ctl_table_header * unix_sysctl_header;
int unix_sysctl_register(struct net *net) int unix_sysctl_register(struct net *net)
{ {
unix_sysctl_header = register_sysctl_paths(unix_path, unix_table); struct ctl_table *table;
return unix_sysctl_header == NULL ? -ENOMEM : 0;
table = kmemdup(unix_table, sizeof(unix_table), GFP_KERNEL);
if (table == NULL)
goto err_alloc;
table[0].data = &net->sysctl_unix_max_dgram_qlen;
net->unix_ctl = register_net_sysctl_table(net, unix_path, table);
if (net->unix_ctl == NULL)
goto err_reg;
return 0;
err_reg:
kfree(table);
err_alloc:
return -ENOMEM;
} }
void unix_sysctl_unregister(struct net *net) void unix_sysctl_unregister(struct net *net)
{ {
unregister_sysctl_table(unix_sysctl_header); struct ctl_table *table;
table = net->unix_ctl->ctl_table_arg;
unregister_sysctl_table(net->unix_ctl);
kfree(table);
} }