Skip to content

Commit cbeafa7

Browse files
YuKuai-huaweigregkh
authored andcommitted
nbd: call genl_unregister_family() first in nbd_cleanup()
[ Upstream commit 06c4da8 ] Otherwise there may be race between module removal and the handling of netlink command, which can lead to the oops as shown below: BUG: kernel NULL pointer dereference, address: 0000000000000098 Oops: 0002 [#1] SMP PTI CPU: 1 PID: 31299 Comm: nbd-client Tainted: G E 5.14.0-rc4 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996) RIP: 0010:down_write+0x1a/0x50 Call Trace: start_creating+0x89/0x130 debugfs_create_dir+0x1b/0x130 nbd_start_device+0x13d/0x390 [nbd] nbd_genl_connect+0x42f/0x748 [nbd] genl_family_rcv_msg_doit.isra.0+0xec/0x150 genl_rcv_msg+0xe5/0x1e0 netlink_rcv_skb+0x55/0x100 genl_rcv+0x29/0x40 netlink_unicast+0x1a8/0x250 netlink_sendmsg+0x21b/0x430 ____sys_sendmsg+0x2a4/0x2d0 ___sys_sendmsg+0x81/0xc0 __sys_sendmsg+0x62/0xb0 __x64_sys_sendmsg+0x1f/0x30 do_syscall_64+0x3b/0xc0 entry_SYSCALL_64_after_hwframe+0x44/0xae Modules linked in: nbd(E-) Signed-off-by: Hou Tao <[email protected]> Signed-off-by: Yu Kuai <[email protected]> Reviewed-by: Josef Bacik <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jens Axboe <[email protected]> Signed-off-by: Sasha Levin <[email protected]>
1 parent 38d432f commit cbeafa7

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

drivers/block/nbd.c

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2478,6 +2478,12 @@ static void __exit nbd_cleanup(void)
24782478
struct nbd_device *nbd;
24792479
LIST_HEAD(del_list);
24802480

2481+
/*
2482+
* Unregister netlink interface prior to waiting
2483+
* for the completion of netlink commands.
2484+
*/
2485+
genl_unregister_family(&nbd_genl_family);
2486+
24812487
nbd_dbg_close();
24822488

24832489
mutex_lock(&nbd_index_mutex);
@@ -2496,7 +2502,6 @@ static void __exit nbd_cleanup(void)
24962502
destroy_workqueue(nbd_del_wq);
24972503

24982504
idr_destroy(&nbd_index_idr);
2499-
genl_unregister_family(&nbd_genl_family);
25002505
unregister_blkdev(NBD_MAJOR, "nbd");
25012506
}
25022507

0 commit comments

Comments
 (0)