bnx2x: fix resource leaks in bnx2x_init_one() error paths

bnx2x_init_one() falls through to the common memory cleanup path for
several failures after probe has already acquired additional resources.

If register_netdev() fails after bnx2x_set_int_mode(), MSI/MSI-X remains
enabled. If later failures happen after bnx2x_iov_init_one(), PF SR-IOV
state can be left allocated. Also, failures after bnx2x_vfpf_acquire()
must release the PF resources before freeing the VF-PF mailbox allocated
by bnx2x_vf_pci_alloc().

Add error labels matching the resource acquisition order so probe failure
disables MSI/MSI-X, removes SR-IOV state, releases VF-PF resources,
deallocates VF PCI resources, and then frees the common driver memory.
Also clear PCI drvdata before freeing the netdev on probe failure.

Cc: stable+noautosel@kernel.org # untested fix to unlikely error path
Signed-off-by: Haoxiang Li <lihaoxiang@isrc.iscas.ac.cn>
Reviewed-by: Simon Horman <horms@kernel.org>
Link: https://patch.msgid.link/20260609074610.1968721-1-lihaoxiang@isrc.iscas.ac.cn
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
index 6f96645ff23f461c5739432f259776f1dc21e9cf..208a894d6190c66eb00b98572c203ade8ab81225 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
+++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c
@@ -13893,6 +13893,7 @@ static int bnx2x_init_one(struct pci_dev *pdev,
 
        rc = bnx2x_init_dev(bp, pdev, dev, ent->driver_data);
        if (rc < 0) {
+               pci_set_drvdata(pdev, NULL);
                free_netdev(dev);
                return rc;
        }
@@ -13932,13 +13933,13 @@ static int bnx2x_init_one(struct pci_dev *pdev,
                dev_err(&bp->pdev->dev,
                        "Cannot map doorbell space, aborting\n");
                rc = -ENOMEM;
-               goto init_one_freemem;
+               goto init_one_vf_pci_dealloc;
        }
 
        if (IS_VF(bp)) {
                rc = bnx2x_vfpf_acquire(bp, tx_count, rx_count);
                if (rc)
-                       goto init_one_freemem;
+                       goto init_one_vf_pci_dealloc;
 
 #ifdef CONFIG_BNX2X_SRIOV
                /* VF with OLD Hypervisor or old PF do not support filtering */
@@ -13952,7 +13953,7 @@ static int bnx2x_init_one(struct pci_dev *pdev,
        /* Enable SRIOV if capability found in configuration space */
        rc = bnx2x_iov_init_one(bp, int_mode, BNX2X_MAX_NUM_OF_VFS);
        if (rc)
-               goto init_one_freemem;
+               goto init_one_vfpf_release;
 
        /* calc qm_cid_count */
        bp->qm_cid_count = bnx2x_set_qm_cid_count(bp);
@@ -13971,7 +13972,7 @@ static int bnx2x_init_one(struct pci_dev *pdev,
        rc = bnx2x_set_int_mode(bp);
        if (rc) {
                dev_err(&pdev->dev, "Cannot set interrupts\n");
-               goto init_one_freemem;
+               goto init_one_iov_remove;
        }
        BNX2X_DEV_INFO("set interrupts successfully\n");
 
@@ -13979,7 +13980,7 @@ static int bnx2x_init_one(struct pci_dev *pdev,
        rc = register_netdev(dev);
        if (rc) {
                dev_err(&pdev->dev, "Cannot register net device\n");
-               goto init_one_freemem;
+               goto init_one_disable_msi;
        }
        BNX2X_DEV_INFO("device name after netdev register %s\n", dev->name);
 
@@ -14001,6 +14002,20 @@ static int bnx2x_init_one(struct pci_dev *pdev,
 
        return 0;
 
+init_one_disable_msi:
+       bnx2x_disable_msi(bp);
+
+init_one_iov_remove:
+       bnx2x_iov_remove_one(bp);
+
+init_one_vfpf_release:
+       if (IS_VF(bp))
+               bnx2x_vfpf_release(bp);
+
+init_one_vf_pci_dealloc:
+       if (IS_VF(bp))
+               bnx2x_vf_pci_dealloc(bp);
+
 init_one_freemem:
        bnx2x_free_mem_bp(bp);
 
@@ -14011,6 +14026,7 @@ init_one_exit:
        if (IS_PF(bp) && bp->doorbells)
                iounmap(bp->doorbells);
 
+       pci_set_drvdata(pdev, NULL);
        free_netdev(dev);
 
        if (atomic_read(&pdev->enable_cnt) == 1)