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 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4DB5BCCA473 for ; Wed, 6 Jul 2022 15:34:53 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233898AbiGFPev (ORCPT ); Wed, 6 Jul 2022 11:34:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46096 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234128AbiGFPeR (ORCPT ); Wed, 6 Jul 2022 11:34:17 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 45EEC286F9; Wed, 6 Jul 2022 08:32:57 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id B67A061FF6; Wed, 6 Jul 2022 15:32:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E44AFC341CA; Wed, 6 Jul 2022 15:32:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1657121576; bh=QcGtGtCYqtma3sZUNavLiHZxpdlk17kScyhaXBAROMU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=j7AnnwQrpA4MrE2f3MIjNZuZR0xe37fiVH81hqjZrkPwGASW4J7QlCpQTXLCanKos EflStR5deiSBWrHwzx8l57VziLMEchyiQ2CaYPUvFmS0A1KVj1mcdBMGfpbyQ8JVTW QdBWfmjyZfUAOnOpUmAMGXEnXlxG5veu9fhz81SogtqeUA/fp0zyZkj0NDM+rjnF/t rx0Ju52mLdvqO/STWKen7ypGkN//wHuCZyuz3ShwjvwaO/s+mcTipxk4MtOgW7RjRA rh40l2545wFwDSvtkdo+imCXBMzaJxgHxDXY1T6fn612Ro/jOjqjiA38xmuLkkCuqs 71Vjd6Xt7Oc0A== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jianglei Nie , Russell King , Paolo Abeni , Sasha Levin , linux@armlinux.org.uk, andrew@lunn.ch, hkallweit1@gmail.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, netdev@vger.kernel.org Subject: [PATCH AUTOSEL 5.15 18/18] net: sfp: fix memory leak in sfp_probe() Date: Wed, 6 Jul 2022 11:31:53 -0400 Message-Id: <20220706153153.1598076-18-sashal@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20220706153153.1598076-1-sashal@kernel.org> References: <20220706153153.1598076-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: netdev@vger.kernel.org From: Jianglei Nie [ Upstream commit 0a18d802d65cf662644fd1d369c86d84a5630652 ] sfp_probe() allocates a memory chunk from sfp with sfp_alloc(). When devm_add_action() fails, sfp is not freed, which leads to a memory leak. We should use devm_add_action_or_reset() instead of devm_add_action(). Signed-off-by: Jianglei Nie Reviewed-by: Russell King (Oracle) Link: https://lore.kernel.org/r/20220629075550.2152003-1-niejianglei2021@163.com Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- drivers/net/phy/sfp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index 90dfefc1f5f8..028a5df5c538 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -2504,7 +2504,7 @@ static int sfp_probe(struct platform_device *pdev) platform_set_drvdata(pdev, sfp); - err = devm_add_action(sfp->dev, sfp_cleanup, sfp); + err = devm_add_action_or_reset(sfp->dev, sfp_cleanup, sfp); if (err < 0) return err; -- 2.35.1