From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sasha Levin Subject: [PATCH AUTOSEL 5.4 11/24] blk-cgroup: Fix memleak on error path Date: Mon, 2 Nov 2020 20:19:54 -0500 Message-ID: <20201103012007.183429-11-sashal@kernel.org> References: <20201103012007.183429-1-sashal@kernel.org> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Return-path: DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604366422; bh=CVemovo84l06d2htmBBz1T2WdlAFJvJ202kE0H7Qbgc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tOzFj0VnCz/sJzniBkZnBW2gYFswRvenKFiEnP/PsstaqHxX+s73vM8qa9GpWJ68Z MR4doWfJVk/nZuhzPIhCYEH82o4iwqs/cWPazDUdkdVvB82eA8dOEyVBrKY1Y+uKSQ WdVsgImJOlmftb0gUTOcFnoeb5C4Wk2Bjnw/sygk= In-Reply-To: <20201103012007.183429-1-sashal@kernel.org> List-ID: Content-Type: text/plain; charset="us-ascii" To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Gabriel Krisman Bertazi , Tejun Heo , Jens Axboe , Sasha Levin , cgroups@vger.kernel.org, linux-block@vger.kernel.org From: Gabriel Krisman Bertazi [ 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 Signed-off-by: Gabriel Krisman Bertazi Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/blk-cgroup.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/blk-cgroup.c b/block/blk-cgroup.c index 0c7addcd19859..a4793cfb68f28 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -861,6 +861,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