| From 83f03a577d7aeaef1ddf12879ada4ced38fee89e Mon Sep 17 00:00:00 2001 |
| From: Shenghui Wang <shhuiw@foxmail.com> |
| Date: Mon, 1 Apr 2019 21:40:36 +0800 |
| Subject: 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 (Microsoft) <sashal@kernel.org> |
| --- |
| block/blk-mq.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/block/blk-mq.c b/block/blk-mq.c |
| index 16f9675c57e6..97eba6d23425 100644 |
| --- a/block/blk-mq.c |
| +++ b/block/blk-mq.c |
| @@ -2341,7 +2341,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); |
| -- |
| 2.20.1 |
| |
