[PATCH iwl-net v1] idpf: fix lan_regs leak on core init failure
From: <hidden>
Date: 2026-07-03 10:42:38
Also in:
intel-wired-lan, lkml
Subsystem:
intel ethernet drivers, networking drivers, the rest · Maintainers:
Tony Nguyen, Przemek Kitszel, Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
From: Xuanqiang Luo <redacted>
idpf_vc_core_init() gets the LAN memory region layout before mapping the
regions and allocating vport resources. Both layout paths allocate
hw->lan_regs, but later error paths return without freeing it.
idpf_vc_core_deinit() does not cover these paths because it returns unless
IDPF_VC_CORE_INIT is set, and that bit is set only after core init
succeeds.
Free hw->lan_regs on the post-allocation error paths and clear the
pointer and region count.
Fixes: 6aa53e861c1a ("idpf: implement get LAN MMIO memory regions")
Signed-off-by: Xuanqiang Luo <redacted>
---
drivers/net/ethernet/intel/idpf/idpf_virtchnl.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
index be66f9b2e101c..da49bb7b7e671 100644
--- a/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c
+++ b/drivers/net/ethernet/intel/idpf/idpf_virtchnl.c@@ -3479,6 +3479,7 @@ static int idpf_vport_params_buf_alloc(struct idpf_adapter *adapter) */ int idpf_vc_core_init(struct idpf_adapter *adapter) { + struct idpf_hw *hw = &adapter->hw; int task_delay = 30; u16 num_max_vports; int err = 0;
@@ -3550,15 +3551,18 @@ int idpf_vc_core_init(struct idpf_adapter *adapter) if (err) { dev_err(&adapter->pdev->dev, "Failed to map BAR0 region(s): %d\n", err); - return -ENOMEM; + err = -ENOMEM; + goto err_lan_regs; } pci_sriov_set_totalvfs(adapter->pdev, idpf_get_max_vfs(adapter)); num_max_vports = idpf_get_max_vports(adapter); adapter->max_vports = num_max_vports; adapter->vports = kzalloc_objs(*adapter->vports, num_max_vports); - if (!adapter->vports) - return -ENOMEM; + if (!adapter->vports) { + err = -ENOMEM; + goto err_lan_regs; + } if (!adapter->netdevs) { adapter->netdevs = kzalloc_objs(struct net_device *,
@@ -3624,6 +3628,10 @@ int idpf_vc_core_init(struct idpf_adapter *adapter) err_netdev_alloc: kfree(adapter->vports); adapter->vports = NULL; +err_lan_regs: + kfree(hw->lan_regs); + hw->lan_regs = NULL; + hw->num_lan_regs = 0; return err; init_failed:
--
2.43.0