diff options
Diffstat (limited to 'net/unix/af_unix.c')
| -rw-r--r-- | net/unix/af_unix.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c index 73620d61762..b8a2189fb5c 100644 --- a/net/unix/af_unix.c +++ b/net/unix/af_unix.c @@ -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); } |