]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commit
tipc: fix modprobe tipc failed after switch order of device registration
authorJunwei Hu <hujunwei4@huawei.com>
Mon, 20 May 2019 06:43:59 +0000 (14:43 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 20 May 2019 17:45:43 +0000 (10:45 -0700)
commit526f5b851a96566803ee4bee60d0a34df56c77f8
tree505f467992c5db001e508d31068e1377fcd8aa1b
parentf49aa1de98363b6c5fba4637678d6b0ba3d18065
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, ...) called by
tipc_topsrv_create_listener() in the initialization process
of tipc_init_net(), so tipc_socket_init() must be execute before that.
Meanwhile, tipc_net_id need to be initialized when sock_create()
called, and tipc_socket_init() is no need to be called for each namespace.

I add a variable tipc_topsrv_net_ops, and split the
register_pernet_subsys() of tipc into two parts, and split
tipc_socket_init() with initialization of pernet params.

By the way, I fixed resources rollback error when tipc_bcast_init()
failed in 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>
Reported-by: syzbot+1e8114b61079bfe9cbc5@syzkaller.appspotmail.com
Reviewed-by: Kang Zhou <zhoukang7@huawei.com>
Reviewed-by: Suanming Mou <mousuanming@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
net/tipc/core.c
net/tipc/subscr.h
net/tipc/topsrv.c