Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8cd5fe62 authored by Paweł Jabłoński's avatar Paweł Jabłoński Committed by Jeff Kirsher
Browse files

i40evf: Fix double locking the same resource 



Removes the locking of adapter->mac_vlan_list_lock resource in
i40evf_add_filter(). The locking part is moved above i40evf_add_filter().
i40evf_add_filter(), called by i40evf_addr_sync(), was trying to lock the
resource again and double locking generated a kernel panic after bringing
an interface up.

Fixes: 8946b563 ("i40evf: use __dev_[um]c_sync routines in
       .set_rx_mode")
Signed-off-by: default avatarPaweł Jabłoński <pawel.jablonski@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent c3880bd1

drivers/net/ethernet/intel/i40evf/i40evf_main.c

+8 −6
Original line number Diff line number Diff line
@@ -815,13 +815,11 @@ i40evf_mac_filter *i40evf_add_filter(struct i40evf_adapter *adapter, 
	if (!macaddr)

		return NULL;



	spin_lock_bh(&adapter->mac_vlan_list_lock);



	f = i40evf_find_filter(adapter, macaddr);

	if (!f) {

		f = kzalloc(sizeof(*f), GFP_ATOMIC);

		if (!f)

			goto clearout;

			return f;



		ether_addr_copy(f->macaddr, macaddr);
@@ -832,8 +830,6 @@ i40evf_mac_filter *i40evf_add_filter(struct i40evf_adapter *adapter, 
		f->remove = false;

	}



clearout:

	spin_unlock_bh(&adapter->mac_vlan_list_lock);

	return f;

}
@@ -868,9 +864,10 @@ static int i40evf_set_mac(struct net_device *netdev, void *p) 
		adapter->aq_required |= I40EVF_FLAG_AQ_DEL_MAC_FILTER;

	}



	f = i40evf_add_filter(adapter, addr->sa_data);



	spin_unlock_bh(&adapter->mac_vlan_list_lock);



	f = i40evf_add_filter(adapter, addr->sa_data);

	if (f) {

		ether_addr_copy(hw->mac.addr, addr->sa_data);

		ether_addr_copy(netdev->dev_addr, adapter->hw.mac.addr);
@@ -3040,7 +3037,12 @@ static int i40evf_open(struct net_device *netdev) 
	if (err)

		goto err_req_irq;



	spin_lock_bh(&adapter->mac_vlan_list_lock);



	i40evf_add_filter(adapter, adapter->hw.mac.addr);



	spin_unlock_bh(&adapter->mac_vlan_list_lock);



	i40evf_configure(adapter);



	i40evf_up_complete(adapter);