Skip to content

Commit 71c142f

Browse files
YuKuai-huaweigregkh
authored andcommitted
nbd: fix race between nbd_alloc_config() and module removal
[ Upstream commit c55b2b9 ] When nbd module is being removing, nbd_alloc_config() may be called concurrently by nbd_genl_connect(), although try_module_get() will return false, but nbd_alloc_config() doesn't handle it. The race may lead to the leak of nbd_config and its related resources (e.g, recv_workq) and oops in nbd_read_stat() due to the unload of nbd module as shown below: BUG: kernel NULL pointer dereference, address: 0000000000000040 Oops: 0000 [#1] SMP PTI CPU: 5 PID: 13840 Comm: kworker/u17:33 Not tainted 5.14.0+ #1 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996) Workqueue: knbd16-recv recv_work [nbd] RIP: 0010:nbd_read_stat.cold+0x130/0x1a4 [nbd] Call Trace: recv_work+0x3b/0xb0 [nbd] process_one_work+0x1ed/0x390 worker_thread+0x4a/0x3d0 kthread+0x12a/0x150 ret_from_fork+0x22/0x30 Fixing it by checking the return value of try_module_get() in nbd_alloc_config(). As nbd_alloc_config() may return ERR_PTR(-ENODEV), assign nbd->config only when nbd_alloc_config() succeeds to ensure the value of nbd->config is binary (valid or NULL). Also adding a debug message to check the reference counter of nbd_config during module removal. 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 cbeafa7 commit 71c142f

File tree

1 file changed

+19
-9
lines changed

1 file changed

+19
-9
lines changed

drivers/block/nbd.c

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1467,15 +1467,20 @@ static struct nbd_config *nbd_alloc_config(void)
14671467
{
14681468
struct nbd_config *config;
14691469

1470+
if (!try_module_get(THIS_MODULE))
1471+
return ERR_PTR(-ENODEV);
1472+
14701473
config = kzalloc(sizeof(struct nbd_config), GFP_NOFS);
1471-
if (!config)
1472-
return NULL;
1474+
if (!config) {
1475+
module_put(THIS_MODULE);
1476+
return ERR_PTR(-ENOMEM);
1477+
}
1478+
14731479
atomic_set(&config->recv_threads, 0);
14741480
init_waitqueue_head(&config->recv_wq);
14751481
init_waitqueue_head(&config->conn_wait);
14761482
config->blksize_bits = NBD_DEF_BLKSIZE_BITS;
14771483
atomic_set(&config->live_connections, 0);
1478-
try_module_get(THIS_MODULE);
14791484
return config;
14801485
}
14811486

@@ -1502,12 +1507,13 @@ static int nbd_open(struct block_device *bdev, fmode_t mode)
15021507
mutex_unlock(&nbd->config_lock);
15031508
goto out;
15041509
}
1505-
config = nbd->config = nbd_alloc_config();
1506-
if (!config) {
1507-
ret = -ENOMEM;
1510+
config = nbd_alloc_config();
1511+
if (IS_ERR(config)) {
1512+
ret = PTR_ERR(config);
15081513
mutex_unlock(&nbd->config_lock);
15091514
goto out;
15101515
}
1516+
nbd->config = config;
15111517
refcount_set(&nbd->config_refs, 1);
15121518
refcount_inc(&nbd->refs);
15131519
mutex_unlock(&nbd->config_lock);
@@ -1914,13 +1920,14 @@ static int nbd_genl_connect(struct sk_buff *skb, struct genl_info *info)
19141920
nbd_put(nbd);
19151921
return -EINVAL;
19161922
}
1917-
config = nbd->config = nbd_alloc_config();
1918-
if (!nbd->config) {
1923+
config = nbd_alloc_config();
1924+
if (IS_ERR(config)) {
19191925
mutex_unlock(&nbd->config_lock);
19201926
nbd_put(nbd);
19211927
printk(KERN_ERR "nbd: couldn't allocate config\n");
1922-
return -ENOMEM;
1928+
return PTR_ERR(config);
19231929
}
1930+
nbd->config = config;
19241931
refcount_set(&nbd->config_refs, 1);
19251932
set_bit(NBD_RT_BOUND, &config->runtime_flags);
19261933

@@ -2493,6 +2500,9 @@ static void __exit nbd_cleanup(void)
24932500
while (!list_empty(&del_list)) {
24942501
nbd = list_first_entry(&del_list, struct nbd_device, list);
24952502
list_del_init(&nbd->list);
2503+
if (refcount_read(&nbd->config_refs))
2504+
printk(KERN_ERR "nbd: possibly leaking nbd_config (ref %d)\n",
2505+
refcount_read(&nbd->config_refs));
24962506
if (refcount_read(&nbd->refs) != 1)
24972507
printk(KERN_ERR "nbd: possibly leaking a device\n");
24982508
nbd_put(nbd);

0 commit comments

Comments
 (0)