Skip to content

Commit 3274627

Browse files
Li Lingfengaxboe
authored andcommitted
nbd: fix uaf in nbd_open
Commit 4af5f2e ("nbd: use blk_mq_alloc_disk and blk_cleanup_disk") cleans up disk by blk_cleanup_disk() and it won't set disk->private_data as NULL as before. UAF may be triggered in nbd_open() if someone tries to open nbd device right after nbd_put() since nbd has been free in nbd_dev_remove(). Fix this by implementing ->free_disk and free private data in it. Fixes: 4af5f2e ("nbd: use blk_mq_alloc_disk and blk_cleanup_disk") Signed-off-by: Li Lingfeng <lilingfeng3@huawei.com> Reviewed-by: Josef Bacik <josef@toxicpanda.com> Link: https://lore.kernel.org/r/20231107103435.2074904-1-lilingfeng@huaweicloud.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent d2f51b3 commit 3274627

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

drivers/block/nbd.c

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,6 @@ static void nbd_dev_remove(struct nbd_device *nbd)
250250
struct gendisk *disk = nbd->disk;
251251

252252
del_gendisk(disk);
253-
put_disk(disk);
254253
blk_mq_free_tag_set(&nbd->tag_set);
255254

256255
/*
@@ -261,7 +260,7 @@ static void nbd_dev_remove(struct nbd_device *nbd)
261260
idr_remove(&nbd_index_idr, nbd->index);
262261
mutex_unlock(&nbd_index_mutex);
263262
destroy_workqueue(nbd->recv_workq);
264-
kfree(nbd);
263+
put_disk(disk);
265264
}
266265

267266
static void nbd_dev_remove_work(struct work_struct *work)
@@ -1608,13 +1607,21 @@ static void nbd_release(struct gendisk *disk)
16081607
nbd_put(nbd);
16091608
}
16101609

1610+
static void nbd_free_disk(struct gendisk *disk)
1611+
{
1612+
struct nbd_device *nbd = disk->private_data;
1613+
1614+
kfree(nbd);
1615+
}
1616+
16111617
static const struct block_device_operations nbd_fops =
16121618
{
16131619
.owner = THIS_MODULE,
16141620
.open = nbd_open,
16151621
.release = nbd_release,
16161622
.ioctl = nbd_ioctl,
16171623
.compat_ioctl = nbd_ioctl,
1624+
.free_disk = nbd_free_disk,
16181625
};
16191626

16201627
#if IS_ENABLED(CONFIG_DEBUG_FS)

0 commit comments

Comments
 (0)