From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Gabriel Krisman Bertazi <krisman@collabora.com>,
Tejun Heo <tj@kernel.org>, Jens Axboe <axboe@kernel.dk>,
Sasha Levin <sashal@kernel.org>,
cgroups@vger.kernel.org, linux-block@vger.kernel.org
Subject: [PATCH AUTOSEL 4.19 05/11] blk-cgroup: Fix memleak on error path
Date: Mon, 2 Nov 2020 20:20:33 -0500 [thread overview]
Message-ID: <20201103012039.183672-5-sashal@kernel.org> (raw)
In-Reply-To: <20201103012039.183672-1-sashal@kernel.org>
From: Gabriel Krisman Bertazi <krisman@collabora.com>
[ 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>
---
block/blk-cgroup.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c
index a06547fe6f6b4..51fc803c999d7 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;
}
--
2.27.0
next prev parent reply other threads:[~2020-11-03 1:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 1:20 [PATCH AUTOSEL 4.19 01/11] ARM: dts: sun4i-a10: fix cpu_alert temperature Sasha Levin
2020-11-03 1:20 ` [PATCH AUTOSEL 4.19 02/11] arm64: dts: meson-axg-s400: enable USB OTG Sasha Levin
2020-11-03 8:56 ` Neil Armstrong
2020-11-03 1:20 ` [PATCH AUTOSEL 4.19 03/11] x86/kexec: Use up-to-dated screen_info copy to fill boot params Sasha Levin
2020-11-03 1:20 ` [PATCH AUTOSEL 4.19 04/11] of: Fix reserved-memory overlap detection Sasha Levin
2020-11-03 1:20 ` Sasha Levin [this message]
2020-11-03 1:20 ` [PATCH AUTOSEL 4.19 06/11] blk-cgroup: Pre-allocate tree node on blkg_conf_prep Sasha Levin
2020-11-03 1:20 ` [PATCH AUTOSEL 4.19 07/11] scsi: core: Don't start concurrent async scan on same host Sasha Levin
2020-11-03 1:20 ` [PATCH AUTOSEL 4.19 08/11] vsock: use ns_capable_noaudit() on socket create Sasha Levin
2020-11-03 1:20 ` [PATCH AUTOSEL 4.19 09/11] nvme-rdma: handle unexpected nvme completion data length Sasha Levin
2020-11-03 1:20 ` [PATCH AUTOSEL 4.19 10/11] drm/vc4: drv: Add error handding for bind Sasha Levin
2020-11-03 1:20 ` [PATCH AUTOSEL 4.19 11/11] ACPI: NFIT: Fix comparison to '-ENXIO' Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201103012039.183672-5-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=axboe@kernel.dk \
--cc=cgroups@vger.kernel.org \
--cc=krisman@collabora.com \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=stable@vger.kernel.org \
--cc=tj@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®