[AX.25]: Fix unchecked rose_add_loopback_node uses

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Ralf Baechle 2006-12-14 15:51:44 -08:00 committed by David S. Miller
parent a4282717c1
commit a159aaa328
1 changed files with 18 additions and 4 deletions

View File

@ -93,20 +93,34 @@ static int rose_rebuild_header(struct sk_buff *skb)
static int rose_set_mac_address(struct net_device *dev, void *addr) static int rose_set_mac_address(struct net_device *dev, void *addr)
{ {
struct sockaddr *sa = addr; struct sockaddr *sa = addr;
int err;
if (!memcpy(dev->dev_addr, sa->sa_data, dev->addr_len))
return 0;
if (dev->flags & IFF_UP) {
err = rose_add_loopback_node((rose_address *)dev->dev_addr);
if (err)
return err;
rose_del_loopback_node((rose_address *)dev->dev_addr); rose_del_loopback_node((rose_address *)dev->dev_addr);
}
memcpy(dev->dev_addr, sa->sa_data, dev->addr_len); memcpy(dev->dev_addr, sa->sa_data, dev->addr_len);
rose_add_loopback_node((rose_address *)dev->dev_addr);
return 0; return 0;
} }
static int rose_open(struct net_device *dev) static int rose_open(struct net_device *dev)
{ {
int err;
err = rose_add_loopback_node((rose_address *)dev->dev_addr);
if (err)
return err;
netif_start_queue(dev); netif_start_queue(dev);
rose_add_loopback_node((rose_address *)dev->dev_addr);
return 0; return 0;
} }