]> git.baikalelectronics.ru Git - kernel.git/commitdiff
net: sfp: fix memory leak in sfp_probe()
authorJianglei Nie <niejianglei2021@163.com>
Wed, 29 Jun 2022 07:55:50 +0000 (15:55 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 21 Jul 2022 18:59:25 +0000 (20:59 +0200)
[ Upstream commit 32ffa70f11d89162a6f6ca6d3d1b3795c8e0d262 ]

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

index 5657c604602e809f249db8e2b46812b7a1a5b73c..beaa00342a13f602a316969951dda90e4587adb2 100644 (file)
@@ -1878,7 +1878,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;