Skip to content

Commit

Permalink
net: check retval of dev_addr_init()
Browse files Browse the repository at this point in the history
Add missed checking of dev_addr_init return value in alloc_netdev_mq.

Signed-off-by: Jiri Pirko <jpirko@redhat.com>

 net/core/dev.c |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Jiri Pirko authored and David S. Miller committed May 9, 2009
1 parent 9948bb6 commit ab9c73c
Showing 1 changed file with 12 additions and 3 deletions.
15 changes: 12 additions & 3 deletions net/core/dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -5007,13 +5007,16 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,
if (!tx) {
printk(KERN_ERR "alloc_netdev: Unable to allocate "
"tx qdiscs.\n");
kfree(p);
return NULL;
goto free_p;
}

dev = (struct net_device *)
(((long)p + NETDEV_ALIGN_CONST) & ~NETDEV_ALIGN_CONST);
dev->padded = (char *)dev - (char *)p;

if (dev_addr_init(dev))
goto free_tx;

dev_net_set(dev, &init_net);

dev->_tx = tx;
Expand All @@ -5022,13 +5025,19 @@ struct net_device *alloc_netdev_mq(int sizeof_priv, const char *name,

dev->gso_max_size = GSO_MAX_SIZE;

dev_addr_init(dev);
netdev_init_queues(dev);

INIT_LIST_HEAD(&dev->napi_list);
setup(dev);
strcpy(dev->name, name);
return dev;

free_tx:
kfree(tx);

free_p:
kfree(p);
return NULL;
}
EXPORT_SYMBOL(alloc_netdev_mq);

Expand Down

0 comments on commit ab9c73c

Please sign in to comment.