]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
net: ethernet: mtk_eth_soc: fix error handling in mtk_open()
authorLiu Jian <liujian56@huawei.com>
Thu, 17 Nov 2022 11:13:56 +0000 (19:13 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 2 Dec 2022 16:40:00 +0000 (17:40 +0100)
[ Upstream commit f70074140524c59a0935947b06dd6cb6e1ea642d ]

If mtk_start_dma() fails, invoke phylink_disconnect_phy() to perform
cleanup. phylink_disconnect_phy() contains the put_device action. If
phylink_disconnect_phy is not performed, the Kref of netdev will leak.

Fixes: b8fc9f30821e ("net: ethernet: mediatek: Add basic PHYLINK support")
Signed-off-by: Liu Jian <liujian56@huawei.com>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://lore.kernel.org/r/20221117111356.161547-1-liujian56@huawei.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/net/ethernet/mediatek/mtk_eth_soc.c

index c7aff89141e175d615ff5ec7fb61bef332e34f75..217dc67c48fa247192b24f3de609fcf684bcff39 100644 (file)
@@ -2299,7 +2299,10 @@ static int mtk_open(struct net_device *dev)
                int err = mtk_start_dma(eth);
 
                if (err)
+               if (err) {
+                       phylink_disconnect_phy(mac->phylink);
                        return err;
+               }
 
                mtk_gdm_config(eth, MTK_GDMA_TO_PDMA);