diff options
| author | zhengbin <zhengbin13@huawei.com> | 2019-08-12 20:36:55 +0800 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2019-08-12 08:14:11 -0600 |
| commit | e26cc08265dda37d2acc8394604f220ef412299d (patch) | |
| tree | 502e5600f432e2a4def57d560a73788b53a14d54 /block/blk-sysfs.c | |
| parent | 0c9c83043d4957092f74173cfeeb5bc63e7a70e7 (diff) | |
| download | linux-e26cc08265dda37d2acc8394604f220ef412299d.tar.gz linux-e26cc08265dda37d2acc8394604f220ef412299d.tar.bz2 linux-e26cc08265dda37d2acc8394604f220ef412299d.zip | |
blk-mq: move cancel of requeue_work to the front of blk_exit_queue
blk_exit_queue will free elevator_data, while blk_mq_requeue_work
will access it. Move cancel of requeue_work to the front of
blk_exit_queue to avoid use-after-free.
blk_exit_queue blk_mq_requeue_work
__elevator_exit blk_mq_run_hw_queues
blk_mq_exit_sched blk_mq_run_hw_queue
dd_exit_queue blk_mq_hctx_has_pending
kfree(elevator_data) blk_mq_sched_has_work
dd_has_work
Fixes: fbc2a15e3433 ("blk-mq: move cancel of requeue_work into blk_mq_release")
Cc: stable@vger.kernel.org
Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: zhengbin <zhengbin13@huawei.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk-sysfs.c')
| -rw-r--r-- | block/blk-sysfs.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/block/blk-sysfs.c b/block/blk-sysfs.c index 977c659dcd18..9bfa3ea4ed63 100644 --- a/block/blk-sysfs.c +++ b/block/blk-sysfs.c @@ -892,6 +892,9 @@ static void __blk_release_queue(struct work_struct *work) blk_free_queue_stats(q->stats); + if (queue_is_mq(q)) + cancel_delayed_work_sync(&q->requeue_work); + blk_exit_queue(q); blk_queue_free_zone_bitmaps(q); |