net-sysfs: call dev_hold if kobject_init_and_add success (a3e23f71) · Commits · 戴 / test

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:

Hulk Robot <hulkci@huawei.com> Fixes: ("net: don't decrement kobj reference count on init failure") Signed-off-by:

YueHaibing <yuehaibing@huawei.com> Signed-off-by:

David S. Miller <davem@davemloft.net>

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;
		}

Admin message