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

Commit a3e23f71 authored by YueHaibing's avatar YueHaibing Committed by David S. Miller
Browse files

net-sysfs: call dev_hold if kobject_init_and_add success 



In netdev_queue_add_kobject and rx_queue_add_kobject,
if sysfs_create_group failed, kobject_put will call
netdev_queue_release to decrease dev refcont, however
dev_hold has not be called. So we will see this while
unregistering dev:

unregister_netdevice: waiting for bcsh0 to become free. Usage count = -1

Reported-by: default avatarHulk Robot <hulkci@huawei.com>
Fixes: d0d66837 ("net: don't decrement kobj reference count on init failure")
Signed-off-by: default avatarYueHaibing <yuehaibing@huawei.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 223a960c

net/core/net-sysfs.c

+4 −2
Original line number Diff line number Diff line
@@ -928,6 +928,8 @@ static int rx_queue_add_kobject(struct net_device *dev, int index) 
	if (error)

		return error;



	dev_hold(queue->dev);



	if (dev->sysfs_rx_queue_group) {

		error = sysfs_create_group(kobj, dev->sysfs_rx_queue_group);

		if (error) {
@@ -937,7 +939,6 @@ static int rx_queue_add_kobject(struct net_device *dev, int index) 
	}



	kobject_uevent(kobj, KOBJ_ADD);

	dev_hold(queue->dev);



	return error;

}
@@ -1464,6 +1465,8 @@ static int netdev_queue_add_kobject(struct net_device *dev, int index) 
	if (error)

		return error;



	dev_hold(queue->dev);



#ifdef CONFIG_BQL

	error = sysfs_create_group(kobj, &dql_group);

	if (error) {
@@ -1473,7 +1476,6 @@ static int netdev_queue_add_kobject(struct net_device *dev, int index) 
#endif



	kobject_uevent(kobj, KOBJ_ADD);

	dev_hold(queue->dev);



	return 0;

}