Skip to content

Commit f0d385f

Browse files
Ming Leiaxboe
authored andcommitted
ublk: fix use-after-free in ublk_partition_scan_work
A race condition exists between the async partition scan work and device teardown that can lead to a use-after-free of ub->ub_disk: 1. ublk_ctrl_start_dev() schedules partition_scan_work after add_disk() 2. ublk_stop_dev() calls ublk_stop_dev_unlocked() which does: - del_gendisk(ub->ub_disk) - ublk_detach_disk() sets ub->ub_disk = NULL - put_disk() which may free the disk 3. The worker ublk_partition_scan_work() then dereferences ub->ub_disk leading to UAF Fix this by using ublk_get_disk()/ublk_put_disk() in the worker to hold a reference to the disk during the partition scan. The spinlock in ublk_get_disk() synchronizes with ublk_detach_disk() ensuring the worker either gets a valid reference or sees NULL and exits early. Also change flush_work() to cancel_work_sync() to avoid running the partition scan work unnecessarily when the disk is already detached. Fixes: 7fc4da6 ("ublk: scan partition in async way") Reported-by: Ruikai Peng <ruikai@pwno.io> Signed-off-by: Ming Lei <ming.lei@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 9670db2 commit f0d385f

1 file changed

Lines changed: 22 additions & 15 deletions

File tree

drivers/block/ublk_drv.c

Lines changed: 22 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -255,20 +255,6 @@ static inline struct request *__ublk_check_and_get_req(struct ublk_device *ub,
255255
u16 q_id, u16 tag, struct ublk_io *io, size_t offset);
256256
static inline unsigned int ublk_req_build_flags(struct request *req);
257257

258-
static void ublk_partition_scan_work(struct work_struct *work)
259-
{
260-
struct ublk_device *ub =
261-
container_of(work, struct ublk_device, partition_scan_work);
262-
263-
if (WARN_ON_ONCE(!test_and_clear_bit(GD_SUPPRESS_PART_SCAN,
264-
&ub->ub_disk->state)))
265-
return;
266-
267-
mutex_lock(&ub->ub_disk->open_mutex);
268-
bdev_disk_changed(ub->ub_disk, false);
269-
mutex_unlock(&ub->ub_disk->open_mutex);
270-
}
271-
272258
static inline struct ublksrv_io_desc *
273259
ublk_get_iod(const struct ublk_queue *ubq, unsigned tag)
274260
{
@@ -1597,6 +1583,27 @@ static void ublk_put_disk(struct gendisk *disk)
15971583
put_device(disk_to_dev(disk));
15981584
}
15991585

1586+
static void ublk_partition_scan_work(struct work_struct *work)
1587+
{
1588+
struct ublk_device *ub =
1589+
container_of(work, struct ublk_device, partition_scan_work);
1590+
/* Hold disk reference to prevent UAF during concurrent teardown */
1591+
struct gendisk *disk = ublk_get_disk(ub);
1592+
1593+
if (!disk)
1594+
return;
1595+
1596+
if (WARN_ON_ONCE(!test_and_clear_bit(GD_SUPPRESS_PART_SCAN,
1597+
&disk->state)))
1598+
goto out;
1599+
1600+
mutex_lock(&disk->open_mutex);
1601+
bdev_disk_changed(disk, false);
1602+
mutex_unlock(&disk->open_mutex);
1603+
out:
1604+
ublk_put_disk(disk);
1605+
}
1606+
16001607
/*
16011608
* Use this function to ensure that ->canceling is consistently set for
16021609
* the device and all queues. Do not set these flags directly.
@@ -2041,7 +2048,7 @@ static void ublk_stop_dev(struct ublk_device *ub)
20412048
mutex_lock(&ub->mutex);
20422049
ublk_stop_dev_unlocked(ub);
20432050
mutex_unlock(&ub->mutex);
2044-
flush_work(&ub->partition_scan_work);
2051+
cancel_work_sync(&ub->partition_scan_work);
20452052
ublk_cancel_dev(ub);
20462053
}
20472054

0 commit comments

Comments
 (0)