[PATCH 5.2 089/313] blk-mq: Fix memory leak in blk_mq_init_allocated_queue error handling

[Greg Kroah-Hartman]

From: zhengbin <zhengbi...@huawei.com>

[ Upstream commit 73d9c8d4c0017e21e1ff519474ceb1450484dc9a ]

If blk_mq_init_allocated_queue->elevator_init_mq fails, need to release
the previously requested resources.

Fixes: d34849913819 ("blk-mq-sched: allow setting of default IO scheduler")
Signed-off-by: zhengbin <zhengbi...@huawei.com>
Signed-off-by: Jens Axboe <ax...@kernel.dk>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 block/blk-mq.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/block/blk-mq.c b/block/blk-mq.c
index 68106a41f90d2..f934e8afe5b43 100644
--- a/block/blk-mq.c
+++ b/block/blk-mq.c
@@ -2853,6 +2853,8 @@ static unsigned int nr_hw_queues(struct blk_mq_tag_set 
*set)
 struct request_queue *blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,
                                                  struct request_queue *q)
 {
+       int ret = -ENOMEM;
+
        /* mark the queue as mq asap */
        q->mq_ops = set->ops;
 
@@ -2914,17 +2916,18 @@ struct request_queue 
*blk_mq_init_allocated_queue(struct blk_mq_tag_set *set,
        blk_mq_map_swqueue(q);
 
        if (!(set->flags & BLK_MQ_F_NO_SCHED)) {
-               int ret;
-
                ret = elevator_init_mq(q);
                if (ret)
-                       return ERR_PTR(ret);
+                       goto err_tag_set;
        }
 
        return q;
 
+err_tag_set:
+       blk_mq_del_queue_tag_set(q);
 err_hctxs:
        kfree(q->queue_hw_ctx);
+       q->nr_hw_queues = 0;
 err_sys_init:
        blk_mq_sysfs_deinit(q);
 err_poll:
-- 
2.20.1