blk-mq: move cancel of hctx->run_work to the front of blk_exit_queue
PATCH 1/1 blk-mq: move cancel of hctx->run_work to the front of blk_exit_queue
blk_exit_queue will free elevator_data, while blk_mq_run_work_fn will access it. Move cancel of hctx->run_work to the front of blk_exit_queue to avoid use-after-free.
Fixes 1b97871b501f ("blk-mq: move cancel of hctx->run_work into blk_mq_hw_sysfs_release")
Signed-off-by Yang Yang <[email protected]>
--- block/blk-mq-sysfs.c | 2 -- block/blk-sysfs.c | 9 ++++++++- 2 files changed, 8 insertions(+), 3 deletions(-)
block/blk-mq-sysfs.c +0 -2
@@ -36,8 +36,6 @@ static void blk_mq_hw_sysfs_release(struct kobject *kobj) struct blk_mq_hw_ctx *hctx = container_of(kobj, struct blk_mq_hw_ctx, kobj); -cancel_delayed_work_sync (&hctx->run_work); -if (hctx->flags &BLK_MQ_F_BLOCKING )cleanup_srcu_struct (hctx->srcu);blk_free_flush_queue (hctx->fq);
block/blk-sysfs.c +8 -1
@@ -934,9 +934,16 @@ static void blk_release_queue(struct kobject *kobj)blk_free_queue_stats (q->stats); -if (queue_is_mq (q)) +if (queue_is_mq (q)) { +struct blk_mq_hw_ctx *hctx; +int i; +cancel_delayed_work_sync (&q->requeue_work); +queue_for_each_hw_ctx (q, hctx, i) +cancel_delayed_work_sync (&hctx->run_work); + } +blk_exit_queue (q);blk_queue_free_zone_bitmaps (q);
Signature · 1 line
2.17.1
Quoted 33 lines · Yang Yang
blk_exit_queuewill freeelevator_data, whileblk_mq_run_work_fnwill access it. Move cancel ofhctx->run_workto the front ofblk_exit_queueto avoid use-after-free.Fixes 1b97871b501f ("blk-mq: move cancel of hctx->run_work into blk_mq_hw_sysfs_release")Signed-off-by Yang Yang <[email protected]>--- block/blk-mq-sysfs.c | 2 -- block/blk-sysfs.c | 9 ++++++++- 2 files changed, 8 insertions(+), 3 deletions(-)block/blk-mq-sysfs.c +0
-2@@ -36,8 +36,6 @@ static void blk_mq_hw_sysfs_release(struct kobject *kobj) struct blk_mq_hw_ctx *hctx = container_of(kobj, struct blk_mq_hw_ctx, kobj); -cancel_delayed_work_sync (&hctx->run_work); -if (hctx->flags &BLK_MQ_F_BLOCKING )cleanup_srcu_struct (hctx->srcu);blk_free_flush_queue (hctx->fq);block/blk-sysfs.c +0
-1@@ -934,9 +934,16 @@ static void blk_release_queue(struct kobject *kobj)blk_free_queue_stats (q->stats); -if (queue_is_mq (q))
block/blk-sysfs.c static void blk_release_queue(struct kobject *kobj) · line 946
Quoted 10 lines
block/blk-sysfs.c +8
-0+if (queue_is_mq (q)) { +struct blk_mq_hw_ctx *hctx; +int i; +cancel_delayed_work_sync (&q->requeue_work); +queue_for_each_hw_ctx (q, hctx, i) +cancel_delayed_work_sync (&hctx->run_work); + } +
Looks fine:
Reviewed-by Ming Lei <[email protected]>
Thanks,
Ming
Quoted 3 lines · Yang Yang
blk_exit_queuewill freeelevator_data, whileblk_mq_run_work_fnwill access it. Move cancel ofhctx->run_workto the front ofblk_exit_queueto avoid use-after-free.
Applied, thanks.
Signature · 1 line
Jens Axboe