Commit 8fc3672a authored Oct 27, 2020 by Lijun Pan Committed by Jakub Kicinski Oct 29, 2020

ibmvnic: fix ibmvnic_set_mac



Jakub Kicinski brought up a concern in ibmvnic_set_mac().
ibmvnic_set_mac() does this:

	ether_addr_copy(adapter->mac_addr, addr->sa_data);
	if (adapter->state != VNIC_PROBED)
		rc = __ibmvnic_set_mac(netdev, addr->sa_data);

So if state == VNIC_PROBED, the user can assign an invalid address to
adapter->mac_addr, and ibmvnic_set_mac() will still return 0.

The fix is to validate ethernet address at the beginning of
ibmvnic_set_mac(), and move the ether_addr_copy to
the case of "adapter->state != VNIC_PROBED".

Fixes: c26eba03 ("ibmvnic: Update reset infrastructure to support tunable parameters")
Signed-off-by: Lijun Pan <ljp@linux.ibm.com>
Link: https://lore.kernel.org/r/20201027220456.71450-1-ljp@linux.ibm.com


Signed-off-by: Jakub Kicinski <kuba@kernel.org>

parent 9c3f94e1

drivers/net/ethernet/ibm/ibmvnic.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -1815,9 +1815,13 @@ static int ibmvnic_set_mac(struct net_device netdev, void p)
		int rc;

		rc = 0;
		if (!is_valid_ether_addr(addr->sa_data))
		return -EADDRNOTAVAIL;

		if (adapter->state != VNIC_PROBED) {
		ether_addr_copy(adapter->mac_addr, addr->sa_data);
		if (adapter->state != VNIC_PROBED)
		rc = __ibmvnic_set_mac(netdev, addr->sa_data);
		}

		return rc;
		}

Admin message