net: ethernet: mtk_eth_soc: fix memory leak in error path
Subsystems (4)
v3 cover net: ethernet: mtk_eth_soc: fix memory leak in error path
v1: https://lore.kernel.org/netdev/[email protected]/T/
v2:
- clean up commit message
- new mtk_ppe_deinit() function, call it before calling mtk_mdio_cleanup()
v3:
- split into two patches
Yan Cangang (2):
net: ethernet: mtk_eth_soc: fix resource leak in error path
net: ethernet: mtk_eth_soc: fix memory leak in error path
drivers/net/ethernet/mediatek/mtk_eth_soc.c | 9 +++++---- drivers/net/ethernet/mediatek/mtk_ppe.c | 19 +++++++++++++++++-- drivers/net/ethernet/mediatek/mtk_ppe.h | 1 + 3 files changed, 23 insertions(+), 6 deletions(-)
Signature · 1 line
2.30.2
PATCH v3 1/2 net: ethernet: mtk_eth_soc: fix resource leak in error path
In mtk_probe(), when mtk_ppe_init() or mtk_eth_offload_init() failed, mtk_mdio_cleanup() isn't called. Fix it.
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +2 -2
@@ -4145,13 +4145,13 @@ static int mtk_probe(struct platform_device *pdev) eth->soc->offload_version, i);if (!eth->ppe[i]) { err = -ENOMEM ; - goto err_free_dev; + goto err_deinit_mdio; } } err =mtk_eth_offload_init (eth);if (err) - goto err_free_dev; + goto err_deinit_mdio; }for (i =0 ; i <MTK_MAX_DEVS ; i++) {
Signature · 1 line
2.30.2
PATCH v3 2/2 net: ethernet: mtk_eth_soc: fix memory leak in error path
In reply to Yan CangangIn mtk_ppe_init(), when dmam_alloc_coherent() or devm_kzalloc() failed, the rhashtable ppe->l2_flows isn't destroyed. Fix it.
In mtk_probe(), when mtk_ppe_init() or mtk_eth_offload_init() or register_netdev() failed, have the same problem. Fix it.
--- drivers/net/ethernet/mediatek/mtk_eth_soc.c | 9 +++++---- drivers/net/ethernet/mediatek/mtk_ppe.c | 19 +++++++++++++++++-- drivers/net/ethernet/mediatek/mtk_ppe.h | 1 + 3 files changed, 23 insertions(+), 6 deletions(-)
drivers/net/ethernet/mediatek/mtk_eth_soc.c +5 -4
@@ -4145,13 +4145,13 @@ static int mtk_probe(struct platform_device *pdev) eth->soc->offload_version, i);if (!eth->ppe[i]) { err = -ENOMEM ; - goto err_deinit_mdio; + goto err_deinit_ppe; } } err =mtk_eth_offload_init (eth);if (err) - goto err_deinit_mdio; + goto err_deinit_ppe; }for (i =0 ; i <MTK_MAX_DEVS ; i++) {
@@ -4161,7 +4161,7 @@ static int mtk_probe(struct platform_device *pdev) err =register_netdev (eth->netdev[i]);if (err) {dev_err (eth->dev,"error bringing up device\n" ); - goto err_deinit_mdio; + goto err_deinit_ppe; }else netif_info(eth, probe, eth->netdev[i], "mediatek frame engine at 0x%08lx, irq %d\n",
@@ -4179,7 +4179,8 @@ static int mtk_probe(struct platform_device *pdev)return 0 ; -err_deinit_mdio: +err_deinit_ppe: +mtk_ppe_deinit (eth);mtk_mdio_cleanup (eth); err_free_dev:mtk_free_dev (eth);
drivers/net/ethernet/mediatek/mtk_ppe.c +17 -2
@@ -737,7 +737,7 @@ struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base,MTK_PPE_ENTRIES * soc->foe_entry_size, &ppe->foe_phys, GFP_KERNEL);if (!foe) -return NULL ; + goto err_free_l2_flows; ppe->foe_table = foe;
@@ -745,11 +745,26 @@ struct mtk_ppe *mtk_ppe_init(struct mtk_eth *eth, void __iomem *base,sizeof (*ppe->foe_flow); ppe->foe_flow =devm_kzalloc (dev, foe_flow_size,GFP_KERNEL );if (!ppe->foe_flow) -return NULL ; + goto err_free_l2_flows;mtk_ppe_debugfs_init (ppe, index);return ppe; + +err_free_l2_flows: +rhashtable_destroy (&ppe->l2_flows); +return NULL ; +} + +void mtk_ppe_deinit (struct mtk_eth *eth) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (eth->ppe); i++) { +if (!eth->ppe[i]) +return ; +rhashtable_destroy (ð->ppe[i]->l2_flows); + } }static void mtk_ppe_init_foe_table (struct mtk_ppe *ppe)
drivers/net/ethernet/mediatek/mtk_ppe.h +1 -0
@@ -304,6 +304,7 @@ struct mtk_ppe {struct mtk_ppe *mtk_ppe_init (struct mtk_eth *eth,void __iomem *base,int version,int index); +void mtk_ppe_deinit (struct mtk_eth *eth);void mtk_ppe_start (struct mtk_ppe *ppe);int mtk_ppe_stop (struct mtk_ppe *ppe);
Signature · 1 line
2.30.2
Quoted 11 lines · Yan Cangang
v1: https://lore.kernel.org/netdev/[email protected]/T/
v2:
- clean up commit message
- newmtk_ppe_deinit()function, call it before callingmtk_mdio_cleanup()
v3:
- split into two patchesYan Cangang (2):
net: ethernet:mtk_eth_soc: fix resource leak in error path
net: ethernet:mtk_eth_soc: fix memory leak in error path
Thanks,
This series was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net.git (master) by Jakub Kicinski <[email protected]>:
Quoted 8 lines · On Sun, 20 Nov 2022 13:52:57 +0800 you wrote:
v1: https://lore.kernel.org/netdev/[email protected]/T/
v2:
- clean up commit message
- newmtk_ppe_deinit()function, call it before callingmtk_mdio_cleanup()
v3:
- split into two patches[...]
Here is the summary with links:
- [net,v3,1/2] net: ethernet: mtk_eth_soc: fix resource leak in error path
https://git.kernel.org/netdev/net/c/8110437e5961 - [net,v3,2/2] net: ethernet: mtk_eth_soc: fix memory leak in error path https://git.kernel.org/netdev/net/c/603ea5e7ffa7
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html