Commit e256ec83 authored by Andre Guedes's avatar Andre Guedes Committed by Jeff Kirsher
Browse files

igc: Fix NFC rules leak when driver is unloaded 



If we have RFC rules in adapter->nfc_rule_list when the IGC driver
is unloaded, all rules are leaked. This patch fixes the issue by
introducing the helper igc_flush_nfc_rules() and calling it in
igc_remove(). It also updates igc_set_features() so is reuses the
new helper instead of re-implementing it.

Signed-off-by: default avatarAndre Guedes <andre.guedes@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 36fa2152

drivers/net/ethernet/intel/igc/igc_main.c

+16 −13
Original line number Original line Diff line number Diff line
@@ -2544,6 +2544,18 @@ void igc_del_nfc_rule(struct igc_adapter *adapter, struct igc_nfc_rule *rule) 
	kfree(rule);

	kfree(rule);

}

}





static void igc_flush_nfc_rules(struct igc_adapter *adapter)

{

	struct igc_nfc_rule *rule, *tmp;



	spin_lock(&adapter->nfc_rule_lock);



	list_for_each_entry_safe(rule, tmp, &adapter->nfc_rule_list, list)

		igc_del_nfc_rule(adapter, rule);



	spin_unlock(&adapter->nfc_rule_lock);

}



/**

/**

 * igc_add_nfc_rule() - Add NFC rule

 * igc_add_nfc_rule() - Add NFC rule

 * @adapter: Pointer to adapter

 * @adapter: Pointer to adapter
@@ -3967,19 +3979,8 @@ static int igc_set_features(struct net_device *netdev, 
	if (!(changed & (NETIF_F_RXALL | NETIF_F_NTUPLE)))

	if (!(changed & (NETIF_F_RXALL | NETIF_F_NTUPLE)))

		return 0;

		return 0;





	if (!(features & NETIF_F_NTUPLE)) {

	if (!(features & NETIF_F_NTUPLE))

		struct igc_nfc_rule *rule, *tmp;

		igc_flush_nfc_rules(adapter);



		spin_lock(&adapter->nfc_rule_lock);

		list_for_each_entry_safe(rule, tmp,

					 &adapter->nfc_rule_list, list) {

			igc_disable_nfc_rule(adapter, rule);

			list_del(&rule->list);

			kfree(rule);

		}

		spin_unlock(&adapter->nfc_rule_lock);

		adapter->nfc_rule_count = 0;

	}





	netdev->features = features;

	netdev->features = features;
@@ -5246,6 +5247,8 @@ static void igc_remove(struct pci_dev *pdev) 




	pm_runtime_get_noresume(&pdev->dev);

	pm_runtime_get_noresume(&pdev->dev);





	igc_flush_nfc_rules(adapter);



	igc_ptp_stop(adapter);

	igc_ptp_stop(adapter);





	set_bit(__IGC_DOWN, &adapter->state);

	set_bit(__IGC_DOWN, &adapter->state);

CRA Git | Maintained and supported by SUSTech CRA and CCSE