Skip to content

Commit 8cf5f59

Browse files
Lijun Pangregkh
authored andcommitted
ibmvnic: fix ibmvnic_set_mac
[ Upstream commit 8fc3672 ] 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: c26eba0 ("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> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent fa14e0a commit 8cf5f59

1 file changed

Lines changed: 6 additions & 2 deletions

File tree

drivers/net/ethernet/ibm/ibmvnic.c

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1828,9 +1828,13 @@ static int ibmvnic_set_mac(struct net_device *netdev, void *p)
18281828
int rc;
18291829

18301830
rc = 0;
1831-
ether_addr_copy(adapter->mac_addr, addr->sa_data);
1832-
if (adapter->state != VNIC_PROBED)
1831+
if (!is_valid_ether_addr(addr->sa_data))
1832+
return -EADDRNOTAVAIL;
1833+
1834+
if (adapter->state != VNIC_PROBED) {
1835+
ether_addr_copy(adapter->mac_addr, addr->sa_data);
18331836
rc = __ibmvnic_set_mac(netdev, addr->sa_data);
1837+
}
18341838

18351839
return rc;
18361840
}

0 commit comments

Comments
 (0)