blk-cgroup: Fix memleak on error path
authorGabriel Krisman Bertazi <krisman@collabora.com>
Thu, 22 Oct 2020 20:58:41 +0000 (16:58 -0400)
committerJens Axboe <axboe@kernel.dk>
Mon, 26 Oct 2020 13:57:46 +0000 (07:57 -0600)
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>
block/blk-cgroup.c

index f9b5561..f9389b7 100644 (file)
@@ -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;
                }