Skip to content

Commit 826cc42

Browse files
Yang Erkunaxboe
Yang Erkun
authored andcommitted
brd: defer automatic disk creation until module initialization succeeds
My colleague Wupeng found the following problems during fault injection: BUG: unable to handle page fault for address: fffffbfff809d073 PGD 6e648067 P4D 123ec8067 PUD 123ec4067 PMD 100e38067 PTE 0 Oops: Oops: 0000 [#1] PREEMPT SMP KASAN NOPTI CPU: 5 UID: 0 PID: 755 Comm: modprobe Not tainted 6.12.0-rc3+ #17 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS 1.16.1-2.fc37 04/01/2014 RIP: 0010:__asan_load8+0x4c/0xa0 ... Call Trace: <TASK> blkdev_put_whole+0x41/0x70 bdev_release+0x1a3/0x250 blkdev_release+0x11/0x20 __fput+0x1d7/0x4a0 task_work_run+0xfc/0x180 syscall_exit_to_user_mode+0x1de/0x1f0 do_syscall_64+0x6b/0x170 entry_SYSCALL_64_after_hwframe+0x76/0x7e loop_init() is calling loop_add() after __register_blkdev() succeeds and is ignoring disk_add() failure from loop_add(), for loop_add() failure is not fatal and successfully created disks are already visible to bdev_open(). brd_init() is currently calling brd_alloc() before __register_blkdev() succeeds and is releasing successfully created disks when brd_init() returns an error. This can cause UAF for the latter two case: case 1: T1: modprobe brd brd_init brd_alloc(0) // success add_disk disk_scan_partitions bdev_file_open_by_dev // alloc file fput // won't free until back to userspace brd_alloc(1) // failed since mem alloc error inject // error path for modprobe will release code segment // back to userspace __fput blkdev_release bdev_release blkdev_put_whole bdev->bd_disk->fops->release // fops is freed now, UAF! case 2: T1: T2: modprobe brd brd_init brd_alloc(0) // success open(/dev/ram0) brd_alloc(1) // fail // error path for modprobe close(/dev/ram0) ... /* UAF! */ bdev->bd_disk->fops->release Fix this problem by following what loop_init() does. Besides, reintroduce brd_devices_mutex to help serialize modifications to brd_list. Fixes: 7f9b348 ("brd: convert to blk_alloc_disk/blk_cleanup_disk") Reported-by: Wupeng Ma <mawupeng1@huawei.com> Signed-off-by: Yang Erkun <yangerkun@huawei.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://lore.kernel.org/r/20241030034914.907829-1-yangerkun@huaweicloud.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 8d3fd05 commit 826cc42

File tree

1 file changed

+44
-22
lines changed

1 file changed

+44
-22
lines changed

drivers/block/brd.c

+44-22
Original file line numberDiff line numberDiff line change
@@ -316,8 +316,40 @@ __setup("ramdisk_size=", ramdisk_size);
316316
* (should share code eventually).
317317
*/
318318
static LIST_HEAD(brd_devices);
319+
static DEFINE_MUTEX(brd_devices_mutex);
319320
static struct dentry *brd_debugfs_dir;
320321

322+
static struct brd_device *brd_find_or_alloc_device(int i)
323+
{
324+
struct brd_device *brd;
325+
326+
mutex_lock(&brd_devices_mutex);
327+
list_for_each_entry(brd, &brd_devices, brd_list) {
328+
if (brd->brd_number == i) {
329+
mutex_unlock(&brd_devices_mutex);
330+
return ERR_PTR(-EEXIST);
331+
}
332+
}
333+
334+
brd = kzalloc(sizeof(*brd), GFP_KERNEL);
335+
if (!brd) {
336+
mutex_unlock(&brd_devices_mutex);
337+
return ERR_PTR(-ENOMEM);
338+
}
339+
brd->brd_number = i;
340+
list_add_tail(&brd->brd_list, &brd_devices);
341+
mutex_unlock(&brd_devices_mutex);
342+
return brd;
343+
}
344+
345+
static void brd_free_device(struct brd_device *brd)
346+
{
347+
mutex_lock(&brd_devices_mutex);
348+
list_del(&brd->brd_list);
349+
mutex_unlock(&brd_devices_mutex);
350+
kfree(brd);
351+
}
352+
321353
static int brd_alloc(int i)
322354
{
323355
struct brd_device *brd;
@@ -340,14 +372,9 @@ static int brd_alloc(int i)
340372
BLK_FEAT_NOWAIT,
341373
};
342374

343-
list_for_each_entry(brd, &brd_devices, brd_list)
344-
if (brd->brd_number == i)
345-
return -EEXIST;
346-
brd = kzalloc(sizeof(*brd), GFP_KERNEL);
347-
if (!brd)
348-
return -ENOMEM;
349-
brd->brd_number = i;
350-
list_add_tail(&brd->brd_list, &brd_devices);
375+
brd = brd_find_or_alloc_device(i);
376+
if (IS_ERR(brd))
377+
return PTR_ERR(brd);
351378

352379
xa_init(&brd->brd_pages);
353380

@@ -378,8 +405,7 @@ static int brd_alloc(int i)
378405
out_cleanup_disk:
379406
put_disk(disk);
380407
out_free_dev:
381-
list_del(&brd->brd_list);
382-
kfree(brd);
408+
brd_free_device(brd);
383409
return err;
384410
}
385411

@@ -398,8 +424,7 @@ static void brd_cleanup(void)
398424
del_gendisk(brd->brd_disk);
399425
put_disk(brd->brd_disk);
400426
brd_free_pages(brd);
401-
list_del(&brd->brd_list);
402-
kfree(brd);
427+
brd_free_device(brd);
403428
}
404429
}
405430

@@ -426,16 +451,6 @@ static int __init brd_init(void)
426451
{
427452
int err, i;
428453

429-
brd_check_and_reset_par();
430-
431-
brd_debugfs_dir = debugfs_create_dir("ramdisk_pages", NULL);
432-
433-
for (i = 0; i < rd_nr; i++) {
434-
err = brd_alloc(i);
435-
if (err)
436-
goto out_free;
437-
}
438-
439454
/*
440455
* brd module now has a feature to instantiate underlying device
441456
* structure on-demand, provided that there is an access dev node.
@@ -451,11 +466,18 @@ static int __init brd_init(void)
451466
* dynamically.
452467
*/
453468

469+
brd_check_and_reset_par();
470+
471+
brd_debugfs_dir = debugfs_create_dir("ramdisk_pages", NULL);
472+
454473
if (__register_blkdev(RAMDISK_MAJOR, "ramdisk", brd_probe)) {
455474
err = -EIO;
456475
goto out_free;
457476
}
458477

478+
for (i = 0; i < rd_nr; i++)
479+
brd_alloc(i);
480+
459481
pr_info("brd: module loaded\n");
460482
return 0;
461483

0 commit comments

Comments
 (0)