Commit 32ca6868 authored by Emil Tantilov's avatar Emil Tantilov Committed by Jeff Kirsher
Browse files

ixgbevf: fix error code path when setting MAC address 



Return error when a MAC address change is rejected by the PF.

This will prevent the user from modifying the MAC address when
that operation is not permitted.

Signed-off-by: default avatarEmil Tantilov <emil.s.tantilov@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 324d0867

drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c

+8 −4
Original line number Diff line number Diff line
@@ -3692,19 +3692,23 @@ static int ixgbevf_set_mac(struct net_device *netdev, void *p) 
	struct ixgbevf_adapter *adapter = netdev_priv(netdev);

	struct ixgbe_hw *hw = &adapter->hw;

	struct sockaddr *addr = p;

	int err;



	if (!is_valid_ether_addr(addr->sa_data))

		return -EADDRNOTAVAIL;



	ether_addr_copy(netdev->dev_addr, addr->sa_data);

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



	spin_lock_bh(&adapter->mbx_lock);



	hw->mac.ops.set_rar(hw, 0, hw->mac.addr, 0);

	err = hw->mac.ops.set_rar(hw, 0, addr->sa_data, 0);



	spin_unlock_bh(&adapter->mbx_lock);



	if (err)

		return -EPERM;



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

	ether_addr_copy(netdev->dev_addr, addr->sa_data);



	return 0;

}

drivers/net/ethernet/intel/ixgbevf/vf.c

+3 −1
Original line number Diff line number Diff line
@@ -408,8 +408,10 @@ static s32 ixgbevf_set_rar_vf(struct ixgbe_hw *hw, u32 index, u8 *addr, 


	/* if nacked the address was rejected, use "perm_addr" */

	if (!ret_val &&

	    (msgbuf[0] == (IXGBE_VF_SET_MAC_ADDR | IXGBE_VT_MSGTYPE_NACK)))

	    (msgbuf[0] == (IXGBE_VF_SET_MAC_ADDR | IXGBE_VT_MSGTYPE_NACK))) {

		ixgbevf_get_mac_addr_vf(hw, hw->mac.addr);

		return IXGBE_ERR_MBX;

	}



	return ret_val;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE