diff options
| author | Gabriel Krisman Bertazi <krisman@collabora.com> | 2020-10-22 23:58:41 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-11-10 12:29:05 +0300 |
| commit | 928f81df69eb1edda87c97046d6f3491192591db (patch) | |
| tree | bfd82dcfee4d60daae65b368ea069bcf883caaf3 /block | |
| parent | c59d7a4612e0909c3557c23017f5e4db7963e631 (diff) | |
| download | linux-928f81df69eb1edda87c97046d6f3491192591db.tar.xz | |
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>
Diffstat (limited to 'block')
| -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 3dc7c0b4adcb..a7217caea699 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -878,6 +878,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; } |