summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunwei Hu <hujunwei4@huawei.com>2019-05-17 19:27:34 +0800
committerDavid S. Miller <davem@davemloft.net>2019-05-17 11:33:51 -0700
commit532b0f7ece4cb2ffd24dc723ddf55242d1188e5e (patch)
treed428501ce602df759779cfc11cff1e1e0e4c1802
parent38a04b83ab3033905114d608737504e66350088b (diff)
downloadlinux-532b0f7ece4cb2ffd24dc723ddf55242d1188e5e.tar.gz
linux-532b0f7ece4cb2ffd24dc723ddf55242d1188e5e.tar.bz2
linux-532b0f7ece4cb2ffd24dc723ddf55242d1188e5e.zip
tipc: fix modprobe tipc failed after switch order of device registration
Error message printed: modprobe: ERROR: could not insert 'tipc': Address family not supported by protocol. when modprobe tipc after the following patch: switch order of device registration, commit 7e27e8d6130c ("tipc: switch order of device registration to fix a crash") Because sock_create_kern(net, AF_TIPC, ...) is called by tipc_topsrv_create_listener() in the initialization process of tipc_net_ops, tipc_socket_init() must be execute before that. I move tipc_socket_init() into function tipc_init_net(). Fixes: 7e27e8d6130c ("tipc: switch order of device registration to fix a crash") Signed-off-by: Junwei Hu <hujunwei4@huawei.com> Reported-by: Wang Wang <wangwang2@huawei.com> Reviewed-by: Kang Zhou <zhoukang7@huawei.com> Reviewed-by: Suanming Mou <mousuanming@huawei.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--net/tipc/core.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/net/tipc/core.c b/net/tipc/core.c
index ddd2e0f67c07..7d05d6823545 100644
--- a/net/tipc/core.c
+++ b/net/tipc/core.c
@@ -68,6 +68,10 @@ static int __net_init tipc_init_net(struct net *net)
INIT_LIST_HEAD(&tn->node_list);
spin_lock_init(&tn->node_list_lock);
+ err = tipc_socket_init();
+ if (err)
+ goto out_socket;
+
err = tipc_sk_rht_init(net);
if (err)
goto out_sk_rht;
@@ -94,6 +98,8 @@ out_subscr:
out_nametbl:
tipc_sk_rht_destroy(net);
out_sk_rht:
+ tipc_socket_stop();
+out_socket:
return err;
}
@@ -104,6 +110,7 @@ static void __net_exit tipc_exit_net(struct net *net)
tipc_bcast_stop(net);
tipc_nametbl_stop(net);
tipc_sk_rht_destroy(net);
+ tipc_socket_stop();
}
static struct pernet_operations tipc_net_ops = {
@@ -139,10 +146,6 @@ static int __init tipc_init(void)
if (err)
goto out_pernet;
- err = tipc_socket_init();
- if (err)
- goto out_socket;
-
err = tipc_bearer_setup();
if (err)
goto out_bearer;
@@ -150,8 +153,6 @@ static int __init tipc_init(void)
pr_info("Started in single node mode\n");
return 0;
out_bearer:
- tipc_socket_stop();
-out_socket:
unregister_pernet_subsys(&tipc_net_ops);
out_pernet:
tipc_unregister_sysctl();
@@ -167,7 +168,6 @@ out_netlink:
static void __exit tipc_exit(void)
{
tipc_bearer_cleanup();
- tipc_socket_stop();
unregister_pernet_subsys(&tipc_net_ops);
tipc_netlink_stop();
tipc_netlink_compat_stop();