| Message ID | 20221117111356.161547-1-liujian56@huawei.com (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | f70074140524c59a0935947b06dd6cb6e1ea642d |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net] net: ethernet: mtk_eth_soc: fix error handling in mtk_open() | expand |
On Thu, Nov 17, 2022 at 07:13:56PM +0800, Liu Jian wrote: > 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> Looks sensible to me. Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> Thanks.
Hello: This patch was applied to netdev/net.git (master) by Jakub Kicinski <kuba@kernel.org>: On Thu, 17 Nov 2022 19:13:56 +0800 you wrote: > 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> > > [...] Here is the summary with links: - [net] net: ethernet: mtk_eth_soc: fix error handling in mtk_open() https://git.kernel.org/netdev/net/c/f70074140524 You are awesome, thank you!
diff --git a/drivers/net/ethernet/mediatek/mtk_eth_soc.c b/drivers/net/ethernet/mediatek/mtk_eth_soc.c index 7cd381530aa4..1d1f2342e3ec 100644 --- a/drivers/net/ethernet/mediatek/mtk_eth_soc.c +++ b/drivers/net/ethernet/mediatek/mtk_eth_soc.c @@ -2996,8 +2996,10 @@ static int mtk_open(struct net_device *dev) int i; err = mtk_start_dma(eth); - if (err) + if (err) { + phylink_disconnect_phy(mac->phylink); return err; + } for (i = 0; i < ARRAY_SIZE(eth->ppe); i++) mtk_ppe_start(eth->ppe[i]);
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> --- Compile tested only. drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)