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=-12.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham 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 34189C388F7 for ; Mon, 9 Nov 2020 13:13:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DFDBB2076E for ; Mon, 9 Nov 2020 13:13:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604927622; bh=CVemovo84l06d2htmBBz1T2WdlAFJvJ202kE0H7Qbgc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=TJc0W/bFdwH9Ia88CBfXI0u0Fgq1Dt0JA7l3tQcLmvYsEboroqnCExPlH6729O0f/ +qgTsf86xUuhCywvpQ1oZSkAq9GIeRGNotQoyfZjBgJqhOzlFAHD9to7UFDxjd3tOD nYj7Yz2Qw6Ibu05HgjdigwzXzo1JKgj1vqKP+4OI= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733008AbgKINNl (ORCPT ); Mon, 9 Nov 2020 08:13:41 -0500 Received: from mail.kernel.org ([198.145.29.99]:39572 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731621AbgKINNi (ORCPT ); Mon, 9 Nov 2020 08:13:38 -0500 Received: from localhost (83-86-74-64.cable.dynamic.v4.ziggo.nl [83.86.74.64]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id C2C3220663; Mon, 9 Nov 2020 13:13:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1604927618; bh=CVemovo84l06d2htmBBz1T2WdlAFJvJ202kE0H7Qbgc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1wcscH94rDOB4icAPkKRuPNxMrqCv285nfhS/avdfJykCjbg4fDoWuUeXwuIKT39t lT+nowZPiRnbJ9pR2TBf8LEFgh4F8E1cTw5ARhBs5uKc9X2hn2P77rZAY09ki5wpSF e0a56gy6ENibQ0xuPQ5PHgBFPmtIybVePSlJH0LU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Tejun Heo , Gabriel Krisman Bertazi , Jens Axboe , Sasha Levin Subject: [PATCH 5.4 49/85] blk-cgroup: Fix memleak on error path Date: Mon, 9 Nov 2020 13:55:46 +0100 Message-Id: <20201109125024.937551375@linuxfoundation.org> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201109125022.614792961@linuxfoundation.org> References: <20201109125022.614792961@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 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