From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Jianglei Nie <niejianglei2021@163.com>,
Russell King <rmk+kernel@armlinux.org.uk>,
Paolo Abeni <pabeni@redhat.com>, Sasha Levin <sashal@kernel.org>,
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.10 11/11] net: sfp: fix memory leak in sfp_probe()
Date: Wed, 6 Jul 2022 11:32:56 -0400 [thread overview]
Message-ID: <20220706153256.1598411-11-sashal@kernel.org> (raw)
In-Reply-To: <20220706153256.1598411-1-sashal@kernel.org>
From: Jianglei Nie <niejianglei2021@163.com>
[ 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 <niejianglei2021@163.com>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/20220629075550.2152003-1-niejianglei2021@163.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
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 96068e0d841a..dcbe278086dc 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -2427,7 +2427,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
prev parent reply other threads:[~2022-07-06 15:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-07-06 15:32 [PATCH AUTOSEL 5.10 01/11] virtio_mmio: Add missing PM calls to freeze/restore Sasha Levin
2022-07-06 15:32 ` [PATCH AUTOSEL 5.10 02/11] virtio_mmio: Restore guest page size on resume Sasha Levin
2022-07-06 15:32 ` [PATCH AUTOSEL 5.10 03/11] netfilter: br_netfilter: do not skip all hooks with 0 priority Sasha Levin
2022-07-06 15:32 ` [PATCH AUTOSEL 5.10 04/11] scsi: hisi_sas: Limit max hw sectors for v3 HW Sasha Levin
2022-07-06 15:32 ` [PATCH AUTOSEL 5.10 05/11] cpufreq: pmac32-cpufreq: Fix refcount leak bug Sasha Levin
2022-07-06 15:32 ` [PATCH AUTOSEL 5.10 06/11] platform/x86: hp-wmi: Ignore Sanitization Mode event Sasha Levin
2022-07-06 15:32 ` [PATCH AUTOSEL 5.10 07/11] net: tipc: fix possible refcount leak in tipc_sk_create() Sasha Levin
2022-07-06 15:32 ` [PATCH AUTOSEL 5.10 08/11] NFC: nxp-nci: don't print header length mismatch on i2c error Sasha Levin
2022-07-06 15:32 ` [PATCH AUTOSEL 5.10 09/11] nvme-tcp: always fail a request when sending it failed Sasha Levin
2022-07-06 15:32 ` [PATCH AUTOSEL 5.10 10/11] nvme: fix regression when disconnect a recovering ctrl Sasha Levin
2022-07-06 15:32 ` Sasha Levin [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220706153256.1598411-11-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hkallweit1@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=niejianglei2021@163.com \
--cc=pabeni@redhat.com \
--cc=rmk+kernel@armlinux.org.uk \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox