Skip to content

Commit

Permalink
blk-cgroup: Fix memleak on error path
Browse files Browse the repository at this point in the history
[ Upstream commit 52abfcb ]

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>
  • Loading branch information
krisman-at-collabora authored and gregkh committed Nov 10, 2020
1 parent 9070c2b commit 89c94a3
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions block/blk-cgroup.c
Expand Up @@ -654,6 +654,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;
}

Expand Down

0 comments on commit 89c94a3

Please sign in to comment.