Skip to content

Commit

Permalink
[AX.25]: Fix unchecked rose_add_loopback_node uses
Browse files Browse the repository at this point in the history
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Ralf Baechle authored and David S. Miller committed Dec 18, 2006
1 parent a428271 commit a159aaa
Showing 1 changed file with 18 additions and 4 deletions.
22 changes: 18 additions & 4 deletions net/rose/rose_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
struct sockaddr *sa = addr;
int err;

rose_del_loopback_node((rose_address *)dev->dev_addr);
if (!memcpy(dev->dev_addr, sa->sa_data, dev->addr_len))
return 0;

memcpy(dev->dev_addr, sa->sa_data, dev->addr_len);
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_add_loopback_node((rose_address *)dev->dev_addr);
memcpy(dev->dev_addr, sa->sa_data, dev->addr_len);

return 0;
}

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);
rose_add_loopback_node((rose_address *)dev->dev_addr);

return 0;
}

Expand Down

0 comments on commit a159aaa

Please sign in to comment.