Skip to content

Commit 72e2877

Browse files
Ming Leigregkh
authored andcommitted
ublk: fix use-after-free in ublk_partition_scan_work
[ Upstream commit f0d385f ] 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> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 949647e commit 72e2877

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
{
@@ -1663,6 +1649,27 @@ static void ublk_put_disk(struct gendisk *disk)
16631649
put_device(disk_to_dev(disk));
16641650
}
16651651

1652+
static void ublk_partition_scan_work(struct work_struct *work)
1653+
{
1654+
struct ublk_device *ub =
1655+
container_of(work, struct ublk_device, partition_scan_work);
1656+
/* Hold disk reference to prevent UAF during concurrent teardown */
1657+
struct gendisk *disk = ublk_get_disk(ub);
1658+
1659+
if (!disk)
1660+
return;
1661+
1662+
if (WARN_ON_ONCE(!test_and_clear_bit(GD_SUPPRESS_PART_SCAN,
1663+
&disk->state)))
1664+
goto out;
1665+
1666+
mutex_lock(&disk->open_mutex);
1667+
bdev_disk_changed(disk, false);
1668+
mutex_unlock(&disk->open_mutex);
1669+
out:
1670+
ublk_put_disk(disk);
1671+
}
1672+
16661673
/*
16671674
* Use this function to ensure that ->canceling is consistently set for
16681675
* the device and all queues. Do not set these flags directly.
@@ -2107,7 +2114,7 @@ static void ublk_stop_dev(struct ublk_device *ub)
21072114
mutex_lock(&ub->mutex);
21082115
ublk_stop_dev_unlocked(ub);
21092116
mutex_unlock(&ub->mutex);
2110-
flush_work(&ub->partition_scan_work);
2117+
cancel_work_sync(&ub->partition_scan_work);
21112118
ublk_cancel_dev(ub);
21122119
}
21132120

0 commit comments

Comments
 (0)