提交 961e2d0b 编写于 作者: Z zhengbin 提交者: Yongqiang Liu

blk-mq: Fix memory leak in blk_mq_init_allocated_queue error handling

mainline inclusion
from mainline-v5.4-rc1
commit 73d9c8d4
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I5NC63
CVE: NA

--------------------------------

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

Fixes: d3484991 ("blk-mq-sched: allow setting of default IO scheduler")
Signed-off-by: Nzhengbin <zhengbin13@huawei.com>
Signed-off-by: NJens Axboe <axboe@kernel.dk>
Signed-off-by: NYu Kuai <yukuai3@huawei.com>
Reviewed-by: NJason Yan <yanaijie@huawei.com>
Signed-off-by: NYongqiang Liu <liuyongqiang13@huawei.com>
上级 6100cd7f
......@@ -2865,6 +2865,8 @@ static void blk_mq_realloc_hw_ctxs(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;
......@@ -2931,17 +2933,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_exit:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册