From: Shenghui Wang <shhuiw@foxmail.com>
Date: Mon, 1 Apr 2019 13:40:36 +0000 (+0800)
Subject: block: use blk_free_flush_queue() to free hctx->fq in blk_mq_init_hctx
X-Git-Tag: android-x86-8.1-r2~16^2~57^2~55
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=e5be04ee17665571106a95732f28174f3df493ee;p=android-x86%2Fkernel.git

block: use blk_free_flush_queue() to free hctx->fq in blk_mq_init_hctx

[ Upstream commit b9a1ff504b9492ad6beb7d5606e0e3365d4d8499 ]

kfree() can leak the hctx->fq->flush_rq field.

Reviewed-by: Ming Lei <ming.lei@redhat.com>
Signed-off-by: Shenghui Wang <shhuiw@foxmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 7d53f2314d7c..414656796ecf 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2236,7 +2236,7 @@ static int blk_mq_init_hctx(struct request_queue *q,
 	return 0;
 
  free_fq:
-	kfree(hctx->fq);
+	blk_free_flush_queue(hctx->fq);
  exit_hctx:
 	if (set->ops->exit_hctx)
 		set->ops->exit_hctx(hctx, hctx_idx);