Commit 1597fbc0 authored by Pavel Emelyanov's avatar Pavel Emelyanov Committed by David S. Miller

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

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: default avatarPavel Emelyanov <xemul@openvz.org>
Acked-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1d430b91
......@@ -11,6 +11,8 @@
struct proc_dir_entry;
struct net_device;
struct sock;
struct ctl_table_header;
struct net {
atomic_t count; /* To decided when the network
* namespace should be freed.
......@@ -41,6 +43,7 @@ struct net {
/* unix sockets */
int sysctl_unix_max_dgram_qlen;
struct ctl_table_header *unix_ctl;
};
#ifdef CONFIG_NET
......
......@@ -2139,10 +2139,14 @@ static int unix_net_init(struct net *net)
int error = -ENOMEM;
net->sysctl_unix_max_dgram_qlen = 10;
if (unix_sysctl_register(net))
goto out;
#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;
}
#endif
error = 0;
out:
......@@ -2151,6 +2155,7 @@ out:
static void unix_net_exit(struct net *net)
{
unix_sysctl_unregister(net);
proc_net_remove(net, "unix");
}
......@@ -2175,7 +2180,6 @@ static int __init af_unix_init(void)
sock_register(&unix_family_ops);
register_pernet_subsys(&unix_net_ops);
unix_sysctl_register(&init_net);
out:
return rc;
}
......@@ -2183,7 +2187,6 @@ out:
static void __exit af_unix_exit(void)
{
sock_unregister(PF_UNIX);
unix_sysctl_unregister(&init_net);
proto_unregister(&unix_proto);
unregister_pernet_subsys(&unix_net_ops);
}
......
......@@ -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)
{
unix_sysctl_header = register_sysctl_paths(unix_path, unix_table);
return unix_sysctl_header == NULL ? -ENOMEM : 0;
struct ctl_table *table;
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)
{
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);
}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment