diff options
author | Gary Zambrano <zambrano@broadcom.com> | 2006-03-28 17:57:38 -0500 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-03-29 17:34:02 -0500 |
commit | 391fc09a143aac08d1a3dc37b60238612b504ad3 (patch) | |
tree | a4be557a7d86958eb360bf6ac1024b7ec88bb618 | |
parent | bc0e1fc970279c539db1e94dd473acbb193ee473 (diff) |
[PATCH] b44: ensure valid mac addr
Added code to check for invalid MAC address from eeprom or user input.
Signed-off-by: Gary Zambrano <zambrano@broadcom.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r-- | drivers/net/b44.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/drivers/net/b44.c b/drivers/net/b44.c index 2eab2a88c7bf..15032f2c7817 100644 --- a/drivers/net/b44.c +++ b/drivers/net/b44.c | |||
@@ -1339,6 +1339,9 @@ static int b44_set_mac_addr(struct net_device *dev, void *p) | |||
1339 | if (netif_running(dev)) | 1339 | if (netif_running(dev)) |
1340 | return -EBUSY; | 1340 | return -EBUSY; |
1341 | 1341 | ||
1342 | if (!is_valid_ether_addr(addr->sa_data)) | ||
1343 | return -EINVAL; | ||
1344 | |||
1342 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); | 1345 | memcpy(dev->dev_addr, addr->sa_data, dev->addr_len); |
1343 | 1346 | ||
1344 | spin_lock_irq(&bp->lock); | 1347 | spin_lock_irq(&bp->lock); |
@@ -1876,6 +1879,12 @@ static int __devinit b44_get_invariants(struct b44 *bp) | |||
1876 | bp->dev->dev_addr[3] = eeprom[80]; | 1879 | bp->dev->dev_addr[3] = eeprom[80]; |
1877 | bp->dev->dev_addr[4] = eeprom[83]; | 1880 | bp->dev->dev_addr[4] = eeprom[83]; |
1878 | bp->dev->dev_addr[5] = eeprom[82]; | 1881 | bp->dev->dev_addr[5] = eeprom[82]; |
1882 | |||
1883 | if (!is_valid_ether_addr(&bp->dev->dev_addr[0])){ | ||
1884 | printk(KERN_ERR PFX "Invalid MAC address found in EEPROM\n"); | ||
1885 | return -EINVAL; | ||
1886 | } | ||
1887 | |||
1879 | memcpy(bp->dev->perm_addr, bp->dev->dev_addr, bp->dev->addr_len); | 1888 | memcpy(bp->dev->perm_addr, bp->dev->dev_addr, bp->dev->addr_len); |
1880 | 1889 | ||
1881 | bp->phy_addr = eeprom[90] & 0x1f; | 1890 | bp->phy_addr = eeprom[90] & 0x1f; |