Skip to content

Commit 6383447

Browse files
hyperenjuanguy11
authored andcommitted
ixgbe: fix memory leaks in the ixgbe_recovery_probe() path
When ixgbe_recovery_probe() is invoked and this function fails, allocated resources in advance are not completely freed, because ixgbe_probe() returns ixgbe_recovery_probe() directly and ixgbe_recovery_probe() only frees partial resources, resulting in memory leaks including: - adapter->io_addr - adapter->jump_tables[0] - adapter->mac_table - adapter->rss_key - adapter->af_xdp_zc_qps The leaked MMIO region can be observed in /proc/vmallocinfo, and the remaining leaks are reported by kmemleak. Don't return ixgbe_recovery_probe() directly, and instead let ixgbe_probe() to clean up resources on failures. Fixes: 29cb3b8 ("ixgbe: add E610 implementation of FW recovery mode") Signed-off-by: Kohei Enju <enjuk@amazon.com> Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
1 parent e9acda5 commit 6383447

1 file changed

Lines changed: 8 additions & 12 deletions

File tree

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -11468,14 +11468,12 @@ static void ixgbe_set_fw_version(struct ixgbe_adapter *adapter)
1146811468
*/
1146911469
static int ixgbe_recovery_probe(struct ixgbe_adapter *adapter)
1147011470
{
11471-
struct net_device *netdev = adapter->netdev;
1147211471
struct pci_dev *pdev = adapter->pdev;
1147311472
struct ixgbe_hw *hw = &adapter->hw;
11474-
bool disable_dev;
1147511473
int err = -EIO;
1147611474

1147711475
if (hw->mac.type != ixgbe_mac_e610)
11478-
goto clean_up_probe;
11476+
return err;
1147911477

1148011478
ixgbe_get_hw_control(adapter);
1148111479
mutex_init(&hw->aci.lock);
@@ -11507,13 +11505,6 @@ static int ixgbe_recovery_probe(struct ixgbe_adapter *adapter)
1150711505
shutdown_aci:
1150811506
mutex_destroy(&adapter->hw.aci.lock);
1150911507
ixgbe_release_hw_control(adapter);
11510-
clean_up_probe:
11511-
disable_dev = !test_and_set_bit(__IXGBE_DISABLED, &adapter->state);
11512-
free_netdev(netdev);
11513-
devlink_free(adapter->devlink);
11514-
pci_release_mem_regions(pdev);
11515-
if (disable_dev)
11516-
pci_disable_device(pdev);
1151711508
return err;
1151811509
}
1151911510

@@ -11655,8 +11646,13 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
1165511646
if (err)
1165611647
goto err_sw_init;
1165711648

11658-
if (ixgbe_check_fw_error(adapter))
11659-
return ixgbe_recovery_probe(adapter);
11649+
if (ixgbe_check_fw_error(adapter)) {
11650+
err = ixgbe_recovery_probe(adapter);
11651+
if (err)
11652+
goto err_sw_init;
11653+
11654+
return 0;
11655+
}
1166011656

1166111657
if (adapter->hw.mac.type == ixgbe_mac_e610) {
1166211658
err = ixgbe_get_caps(&adapter->hw);

0 commit comments

Comments
 (0)