blk-mq: move cancel of hctx->run_work to the front of blk_exit_queue
[ Upstream commit5.4-rM2-2.2.x-imx-squashed47ce030b7a
] 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:1b97871b50
("blk-mq: move cancel of hctx->run_work into blk_mq_hw_sysfs_release") Signed-off-by: Yang Yang <yang.yang@vivo.com> Reviewed-by: Ming Lei <ming.lei@redhat.com> Signed-off-by: Jens Axboe <axboe@kernel.dk> Signed-off-by: Sasha Levin <sashal@kernel.org>
parent
96bc5e4cb4
commit
450d03435c
|
@ -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,
|
struct blk_mq_hw_ctx *hctx = container_of(kobj, struct blk_mq_hw_ctx,
|
||||||
kobj);
|
kobj);
|
||||||
|
|
||||||
cancel_delayed_work_sync(&hctx->run_work);
|
|
||||||
|
|
||||||
if (hctx->flags & BLK_MQ_F_BLOCKING)
|
if (hctx->flags & BLK_MQ_F_BLOCKING)
|
||||||
cleanup_srcu_struct(hctx->srcu);
|
cleanup_srcu_struct(hctx->srcu);
|
||||||
blk_free_flush_queue(hctx->fq);
|
blk_free_flush_queue(hctx->fq);
|
||||||
|
|
|
@ -891,9 +891,16 @@ static void __blk_release_queue(struct work_struct *work)
|
||||||
|
|
||||||
blk_free_queue_stats(q->stats);
|
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);
|
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_exit_queue(q);
|
||||||
|
|
||||||
blk_queue_free_zone_bitmaps(q);
|
blk_queue_free_zone_bitmaps(q);
|
||||||
|
|
Loading…
Reference in New Issue