Received: by 2002:a05:6a10:16a7:0:0:0:0 with SMTP id gp39csp165584pxb; Mon, 2 Nov 2020 17:29:14 -0800 (PST) X-Google-Smtp-Source: ABdhPJyiQ7rdivh/1UGqDbqCJvOy08tfn2aoZR8zEGI0UBZIA6Nc1aB3f6vDKRZQ5fdmVs4zbOGM X-Received: by 2002:a17:906:d0cc:: with SMTP id bq12mr17719964ejb.127.1604366954089; Mon, 02 Nov 2020 17:29:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604366954; cv=none; d=google.com; s=arc-20160816; b=aQ5n/UA2Br5aSf4Es+w9efFXHzjKQan4WwiiBdDi+UWYbzl673az8KM1LieqwEgAzj IXUU6pP1yFCFBCwABzNeMI9t2H7glU+Mdq4B49iXvCt4XBYtIgHIUi3oO0xtdH7hbwaR YyNYEXwBm9W/gJ2KrWeggfhzkEspW15EUmmaYyhvtVBQCqwF4n6xPoPjYNcEYUrgwzZJ x9IP+FI7bpTwbV+Esczk4qOP+kf/xu93iLccV146vdY8dZPc15Zi0+wQpdjQ2dpLfYIG d+fEOR4HiaiKAXpiWTpCievoIssKvAaJfY+h4OMj9ezLOcxirpCGOrWSiCioQ0+V62w2 2aYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=/+nkifXQZWuo1a4KgnKLdr4AAt8KkxnAlsF6S6Byd7o=; b=bE12K3SCFYR893MNec3lhNBmZ8lkU6m8oowW8jlB0CW2ED1/gmtxwIfDZiGQCnjXmU zKeKTC8Vb+AzEbRAO68u0ZuOO1GCwIHnnU2xKzZFFkpIFXLn6MAZaTiaQxOlpoNKxYsp u9GXGFfAaYFJCP38tD5miimI6Fc0a206w/5bUQiojBiCxnwmGgVTGgq+syatRaP9I8lT 3Lcea3s17EXfVKI0dnfjEMnkJso1yOuecAkbzuOlCVjTMkWHk61EhXqtgrlxZXZ5pBpK X4v/u3rMjkTy+GdismKRgUeVa4axQaTEXdssD4a3Uga42AWyI9EBKA3fQkhAmlfDUAgH qqTQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WA+nWJFa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id a6si11377864ejp.422.2020.11.02.17.28.52; Mon, 02 Nov 2020 17:29:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=WA+nWJFa; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727927AbgKCB1l (ORCPT + 99 others); Mon, 2 Nov 2020 20:27:41 -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: linux-kernel@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