Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03baf38f authored by Junwei Hu's avatar Junwei Hu Committed by Greg Kroah-Hartman
Browse files

tipc: fix modprobe tipc failed after switch order of device registration 



[ Upstream commit 532b0f7ece4cb2ffd24dc723ddf55242d1188e5e ]

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: default avatarJunwei Hu <hujunwei4@huawei.com>
Reported-by: default avatarWang Wang <wangwang2@huawei.com>
Reviewed-by: default avatarKang Zhou <zhoukang7@huawei.com>
Reviewed-by: default avatarSuanming Mou <mousuanming@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4ea082cd

net/tipc/core.c

+7 −7
Original line number Diff line number Diff line
@@ -62,6 +62,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;
@@ -88,6 +92,8 @@ static int __net_init tipc_init_net(struct net *net) 
out_nametbl:

	tipc_sk_rht_destroy(net);

out_sk_rht:

	tipc_socket_stop();

out_socket:

	return err;

}
@@ -98,6 +104,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 = {
@@ -133,10 +140,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;
@@ -144,8 +147,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();
@@ -161,7 +162,6 @@ static int __init tipc_init(void) 
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();