Commit 391fc09a authored by Gary Zambrano's avatar Gary Zambrano Committed by Jeff Garzik

[PATCH] b44: ensure valid mac addr

Added code to check for invalid MAC address from eeprom or user input.
Signed-off-by: default avatarGary Zambrano <zambrano@broadcom.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent bc0e1fc9
...@@ -1339,6 +1339,9 @@ static int b44_set_mac_addr(struct net_device *dev, void *p) ...@@ -1339,6 +1339,9 @@ static int b44_set_mac_addr(struct net_device *dev, void *p)
if (netif_running(dev)) if (netif_running(dev))
return -EBUSY; return -EBUSY;
if (!is_valid_ether_addr(addr->sa_data))
return -EINVAL;
memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); memcpy(dev->dev_addr, addr->sa_data, dev->addr_len);
spin_lock_irq(&bp->lock); spin_lock_irq(&bp->lock);
...@@ -1876,6 +1879,12 @@ static int __devinit b44_get_invariants(struct b44 *bp) ...@@ -1876,6 +1879,12 @@ static int __devinit b44_get_invariants(struct b44 *bp)
bp->dev->dev_addr[3] = eeprom[80]; bp->dev->dev_addr[3] = eeprom[80];
bp->dev->dev_addr[4] = eeprom[83]; bp->dev->dev_addr[4] = eeprom[83];
bp->dev->dev_addr[5] = eeprom[82]; bp->dev->dev_addr[5] = eeprom[82];
if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){
printk(KERN_ERR PFX "Invalid MAC address found in EEPROM\n");
return -EINVAL;
}
memcpy(bp->dev->perm_addr, bp->dev->dev_addr, bp->dev->addr_len); memcpy(bp->dev->perm_addr, bp->dev->dev_addr, bp->dev->addr_len);
bp->phy_addr = eeprom[90] & 0x1f; bp->phy_addr = eeprom[90] & 0x1f;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment