net: sungem: fix probe error cleanup
Subsystems (2)
PATCH v2 1/1 net: sungem: fix probe error cleanup
gem_init_one() calls gem_remove_one() when register_netdev() fails. gem_remove_one() unregisters and frees resources owned by the net_device, including the DMA block, MMIO mapping, PCI regions, and the net_device itself. gem_init_one() then falls through to its own cleanup labels and frees the same resources again.
Keep the register_netdev() error path in gem_init_one(): clear drvdata so PM/remove paths do not see a half-registered device, remove the NAPI instance added during probe, and let the existing cleanup labels release the resources once.
The issue was found by a local static-analysis checker for probe error paths. The reported path was manually inspected before sending this fix.
Compile-tested with CONFIG_SUNGEM=y. Runtime testing was not performed because no sungem hardware is available.
---
v2:
- Add a Fixes tag.
- Describe how the issue was found.
- Add testing information.
v1: https://lore.kernel.org/netdev/[email protected]/
drivers/net/ethernet/sun/sungem.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-)
drivers/net/ethernet/sun/sungem.c +9 -4
@@ -2986,10 +2986,10 @@ static int gem_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->max_mtu =GEM_MAX_MTU ;/* Register with kernel */ -if (register_netdev (dev)) { + err =register_netdev (dev); +if (err) {pr_err ("Cannot register net device, aborting\n" ); - err = -ENOMEM ; - goto err_out_free_consistent; + goto err_out_clear_drvdata; }/* Undo the get_cell with appropriate locking (we could use
@@ -3003,8 +3003,13 @@ static int gem_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) dev->dev_addr);return 0 ; +err_out_clear_drvdata: +pci_set_drvdata (pdev,NULL ); +netif_napi_del (&gp->napi); + err_out_free_consistent: -gem_remove_one (pdev); +dma_free_coherent (&pdev->dev,sizeof (struct gem_init_block ), + gp->init_block, gp->gblock_dvma); err_out_iounmap:gem_put_cell (gp);iounmap (gp->regs);
Signature · 1 line
2.51.0
Quoted 19 lines · Ruoyu Wang
gem_init_one()callsgem_remove_one()whenregister_netdev()fails.gem_remove_one()unregisters and frees resources owned by thenet_device, including the DMA block, MMIO mapping, PCI regions, and thenet_deviceitself.gem_init_one()then falls through to its own cleanup labels and frees the same resources again.Keep the
register_netdev()error path ingem_init_one(): clear drvdata so PM/remove paths do not see a half-registered device, remove the NAPI instance added during probe, and let the existing cleanup labels release the resources once.The issue was found by a local static-analysis checker for probe error paths. The reported path was manually inspected before sending this fix.
Compile-tested with
CONFIG_SUNGEM=y. Runtime testing was not performed because no sungem hardware is available.Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")Signed-off-by Ruoyu Wang <[email protected]>
Quoted 7 lines
---
v2:
- Add a Fixes tag.
- Describe how the issue was found.
- Add testing information.
Thanks for the update.
This patch was applied to netdev/net.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This patch was applied to netdev/net.git (main)
by Jakub Kicinski <[email protected]>:
Quoted 6 lines · On Tue, 23 Jun 2026 10:57:59 +0800 you wrote:
gem_init_one()callsgem_remove_one()whenregister_netdev()fails.gem_remove_one()unregisters and frees resources owned by thenet_device, including the DMA block, MMIO mapping, PCI regions, and thenet_deviceitself.gem_init_one()then falls through to its own cleanup labels and frees the same resources again.
Quoted 6 lines
Keep the
register_netdev()error path ingem_init_one(): clear drvdata so PM/remove paths do not see a half-registered device, remove the NAPI instance added during probe, and let the existing cleanup labels release the resources once.[...]
Here is the summary with links:
- [net,v2] net: sungem: fix probe error cleanup
https://git.kernel.org/netdev/net/c/36dea2f63924
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html