Reference in a new issue

Blame

Copy permalink

Reference in a new issue

Copy permalink

Chao Shi 26cb8ebbfa block: stop the timeout timer when releasing a never added disk ... disk_release() undoes blk_mq_init_allocated_queue() for a disk whose probe failed before add_disk(), but it only calls blk_mq_exit_queue(). Nothing there stops q->timeout, and that timer rolls forward: it stays pending until it next expires, not until the last request completes. So if the driver issued any I/O before adding the disk, the request_queue is freed while still linked into a timer wheel bucket. Commit 6f8191fdf4 ("block: simplify disk shutdown") dropped the blk_cleanup_queue() call that used to stop it. __del_gendisk() and blk_mq_destroy_queue() still do; only the probe failure path lost it. nvme gets there because nvme_update_ns_info() submits Report Zones or FDP io-mgmt-recv on ns->queue before the disk is added, so a later failure - a concurrent reset setting NVME_CTRL_FROZEN, or device_add_disk() failing - lands in put_disk() with the timer armed: BUG: KASAN: slab-use-after-free in detach_if_pending+0x30c/0x340 Write of size 8 at addr ffff888004d71310 by task kworker/u8:2/37 __timer_delete_sync+0x156/0x240 kernel/time/timer.c:1621 blk_sync_queue+0x22/0x40 block/blk-core.c:222 nvme_sync_queues+0x100/0x150 drivers/nvme/host/core.c:5362 nvme_reset_work+0x138/0x930 drivers/nvme/host/pci.c:3264 Allocated by task 34: __blk_mq_alloc_disk+0x33/0x100 block/blk-mq.c:4462 nvme_alloc_ns+0x290/0x3870 drivers/nvme/host/core.c:4146 Freed by task 0: blk_free_queue_rcu+0x3a/0x50 block/blk-core.c:254 rcu_core+0xc10/0x1730 kernel/rcu/tree.c:2857 The queue being synced there is ctrl->admin_q, only a victim sharing a timer wheel bucket with the freed queue's dangling entry; other runs tripped in enqueue_timer(), __run_timers() or blk_mq_timeout_work(). Failing nvme_alloc_ns() with a debug patch makes it deterministic: one leaked timer trips KASAN within seconds, while 1987 patched releases produced no splat. Stop the timer and the queue work items before blk_mq_exit_queue(), like blk_mq_destroy_queue() does. Found by FuzzNvme. Fixes: 6f8191fdf4 ("block: simplify disk shutdown") Acked-by: Weidong Zhu <weizhu@fiu.edu> Signed-off-by: Chao Shi <coshi036@gmail.com> Reviewed-by: Christoph Hellwig <hch@lst.de> Link: https://patch.msgid.link/20260727201257.211635-1-coshi036@gmail.com Signed-off-by: Jens Axboe <axboe@kernel.dk>		History 2026-07-29 05:23:20 -06:00
..
partitions
badblocks.c
bdev.c	block: Avoid mounting the bdev pseudo-filesystem in userspace	2026-05-26 11:01:55 -06:00
bfq-cgroup.c
bfq-iosched.c
bfq-iosched.h
bfq-wf2q.c	block, bfq: inject I/O to underutilized actuators	2023-01-29 15:18:33 -07:00
bio-integrity-auto.c
bio-integrity-fs.c
bio-integrity.c
bio.c
blk-cgroup-fc-appid.c
blk-cgroup-rwstat.c
blk-cgroup-rwstat.h
blk-cgroup.c
blk-cgroup.h	blk-cgroup: don't nest queue_lock under rcu in blkcg_print_blkgs()	2026-06-24 06:42:19 -06:00
blk-core.c	block: Remove redundant plug in __submit_bio()	2026-06-16 10:06:27 -06:00
blk-crypto-fallback.c
blk-crypto-internal.h
blk-crypto-profile.c
blk-crypto-sysfs.c
blk-crypto.c	- small cleanups in dm-vdo, dm-raid, dm-cache, dm-zoned-metadata	2026-06-16 13:20:54 +05:30
blk-flush.c
blk-ia-ranges.c
blk-integrity.c
blk-ioc.c	copy_process: pass clone_flags as u64 across calltree	2025-09-01 15:31:34 +02:00
blk-iocost.c
blk-iolatency.c	blk-cgroup: delay freeing policy data after rcu grace period	2026-06-24 06:37:54 -06:00
blk-ioprio.c
blk-ioprio.h
blk-lib.c
blk-map.c
blk-merge.c
blk-mq-cpumap.c
blk-mq-debugfs.c
blk-mq-debugfs.h
blk-mq-dma.c
blk-mq-sched.c
blk-mq-sched.h
blk-mq-sysfs.c
blk-mq-tag.c	blk-mq: add tracepoint block_rq_tag_wait	2026-05-26 11:01:54 -06:00
blk-mq.c	blk-mq: bound blk_hctx_poll() to one jiffy	2026-06-26 10:41:33 -06:00
blk-mq.h
blk-pm.c
blk-pm.h
blk-rq-qos.c
blk-rq-qos.h
blk-settings.c
blk-stat.c
blk-stat.h
blk-sysfs.c
blk-throttle.c	blk-cgroup: delay freeing policy data after rcu grace period	2026-06-24 06:37:54 -06:00
blk-throttle.h
blk-timeout.c
blk-wbt.c
blk-wbt.h
blk-zoned.c
blk.h
bsg-lib.c	block: switch numa_node to int in blk_mq_hw_ctx and init_request	2026-05-26 11:01:55 -06:00
bsg.c
disk-events.c
early-lookup.c
elevator.c
elevator.h
error-injection.c
error-injection.h
fops.c	block: add a bio_endio_status helper	2026-05-28 07:59:18 -06:00
genhd.c	block: stop the timeout timer when releasing a never added disk	2026-07-29 05:23:20 -06:00
holder.c
ioctl.c
ioprio.c
Kconfig
Kconfig.iosched
kyber-iosched.c
Makefile
mq-deadline.c
opal_proto.h
sed-opal.c
t10-pi.c