summaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorGabriel Krisman Bertazi <krisman@collabora.com>2020-10-22 16:58:41 -0400
committerJens Axboe <axboe@kernel.dk>2020-10-26 07:57:46 -0600
commit52abfcbd57eefdd54737fc8c2dc79d8f46d4a3e5 (patch)
treea5ebedefbf3c4d43496867f39f5fb07e41b9d063 /block
parent3650b228f83adda7e5ee532e2b90429c03f7b9ec (diff)
downloadlinux-52abfcbd57eefdd54737fc8c2dc79d8f46d4a3e5.tar.bz2
blk-cgroup: Fix memleak on error path
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>
Diffstat (limited to 'block')
-rw-r--r--block/blk-cgroup.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index f9b55614d67d..f9389b7cf823 100644
--- a/block/blk-cgroup.c
+++ b/block/blk-cgroup.c
@@ -663,6 +663,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;
}