Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75a9b99e authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "block: Fix use-after-free issue while accessing ioscheduler lock"

parents 19776fc1 166bbfd0

block/blk-mq-sysfs.c

+0 −1
Original line number Diff line number Diff line
@@ -36,7 +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);

block/blk-sysfs.c

+6 −2
Original line number Diff line number Diff line
@@ -891,9 +891,13 @@ static void __blk_release_queue(struct work_struct *work) 


	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);