diff options
| author | Yufen Yu <yuyufen@huawei.com> | 2020-08-10 22:21:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-09-03 11:26:55 +0200 |
| commit | 05c608f630b9aa21faa3d475122d72f31e4200b2 (patch) | |
| tree | c426dd07527395fadb2ee928a790683a43ba8cf9 /block | |
| parent | 872a2b3182ee94e772ae81f2a10f3118f7b36ffe (diff) | |
| download | linux-stable-05c608f630b9aa21faa3d475122d72f31e4200b2.tar.gz linux-stable-05c608f630b9aa21faa3d475122d72f31e4200b2.tar.bz2 linux-stable-05c608f630b9aa21faa3d475122d72f31e4200b2.zip | |
blkcg: fix memleak for iolatency
[ Upstream commit 27029b4b18aa5d3b060f0bf2c26dae254132cfce ]
Normally, blkcg_iolatency_exit() will free related memory in iolatency
when cleanup queue. But if blk_throtl_init() return error and queue init
fail, blkcg_iolatency_exit() will not do that for us. Then it cause
memory leak.
Fixes: d70675121546 ("block: introduce blk-iolatency io controller")
Signed-off-by: Yufen Yu <yuyufen@huawei.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'block')
| -rw-r--r-- | block/blk-cgroup.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 1eb8895be4c6..0c7addcd1985 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -1219,13 +1219,15 @@ int blkcg_init_queue(struct request_queue *q) if (preloaded) radix_tree_preload_end(); - ret = blk_iolatency_init(q); + ret = blk_throtl_init(q); if (ret) goto err_destroy_all; - ret = blk_throtl_init(q); - if (ret) + ret = blk_iolatency_init(q); + if (ret) { + blk_throtl_exit(q); goto err_destroy_all; + } return 0; err_destroy_all: |