Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ab9c73cc authored by Jiri Pirko's avatar Jiri Pirko Committed by David S. Miller
Browse files

net: check retval of dev_addr_init() 



Add missed checking of dev_addr_init return value in alloc_netdev_mq.

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

 net/core/dev.c |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9948bb6a

net/core/dev.c

+12 −3
Original line number Diff line number Diff line
@@ -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;
@@ -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);