From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 07244C00A89 for ; Tue, 3 Nov 2020 01:27:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id BBD472225E for ; Tue, 3 Nov 2020 01:27:48 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604366868; bh=KWmQaJdU2iocIYH0eNyvWRoarripQ7D0c/jhctXP6ws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=x8tBl+T2qlyG69nA4erhvN554Rm8SG0kkwpWyFQINfjLBTP0Krwetys+pGCMNflTV atG5flYiaZ71ovTsMUkfwGDkByowWrXSHQsCLhkDaaSyF5O6PfJPAuMjyGX7Tn3+Kv ZWAKtseHozQ7fVOXJAiMnH9P/GvUQaaiuDtYZI3M= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728001AbgKCB1k (ORCPT ); Mon, 2 Nov 2020 20:27:40 -0500 Received: from mail.kernel.org ([198.145.29.99]:60720 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727463AbgKCBTD (ORCPT ); Mon, 2 Nov 2020 20:19:03 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 887B8223FB; Tue, 3 Nov 2020 01:19:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604366342; bh=KWmQaJdU2iocIYH0eNyvWRoarripQ7D0c/jhctXP6ws=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WA+nWJFaX3wxmunMKTWSSo2wwqiGkYdB5laFGhEkMEv4+31EHlNxmcJlo/I/tXsxM DpRJvEfehE5jjfSYAJd7R25EbfABLHFNNNLflVwtu2kqTrfA8eFFeob22TGU2JzURM JzYdCYMQolUOv574QrPNqXK+YhNW7fkMMFYUEin8= From: Sasha Levin 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 Subject: [PATCH AUTOSEL 5.9 16/35] blk-cgroup: Fix memleak on error path Date: Mon, 2 Nov 2020 20:18:21 -0500 Message-Id: <20201103011840.182814-16-sashal@kernel.org> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20201103011840.182814-1-sashal@kernel.org> References: <20201103011840.182814-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@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 c195365c98172..7b2df042220d4 100644 --- a/block/blk-cgroup.c +++ b/block/blk-cgroup.c @@ -654,6 +654,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