diff options
| author | Gabriel Krisman Bertazi <krisman@collabora.com> | 2020-10-22 16:58:41 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-10 12:35:59 +0100 |
| commit | 6dba51828dfd31e326e6642727ede24c054a86fe (patch) | |
| tree | 8ffb2227c3cafb3f5ef557769320964a485f8fb7 | |
| parent | b8f922aa95aa07759623e2adab65bdba8811e808 (diff) | |
| download | linux-stable-6dba51828dfd31e326e6642727ede24c054a86fe.tar.gz linux-stable-6dba51828dfd31e326e6642727ede24c054a86fe.tar.bz2 linux-stable-6dba51828dfd31e326e6642727ede24c054a86fe.zip | |
blk-cgroup: Fix memleak on error path
[ Upstream commit 52abfcbd57eefdd54737fc8c2dc79d8f46d4a3e5 ]
If new_blkg allocation raced with blk_policy change and
blkg_lookup_check fails, new_blkg is leaked.
Acked-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | block/blk-cgroup.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index a06547fe6f6b..51fc803c999d 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -882,6 +882,7 @@ int blkg_conf_prep(struct blkcg *blkcg, const struct blkcg_policy *pol, blkg = blkg_lookup_check(pos, pol, q); if (IS_ERR(blkg)) { ret = PTR_ERR(blkg); + blkg_free(new_blkg); goto fail_unlock; } |