Commit d0d66837 authored by stephen hemminger's avatar stephen hemminger Committed by David S. Miller
Browse files

net: don't decrement kobj reference count on init failure 



If kobject_init_and_add failed, then the failure path would
decrement the reference count of the queue kobject whose reference
count was already zero.

Fixes: 114cf580 ("bql: Byte queue limits")
Signed-off-by: default avatarStephen Hemminger <sthemmin@microsoft.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 01d300c5

net/core/net-sysfs.c

+10 −12
Original line number Diff line number Diff line
@@ -917,20 +917,19 @@ static int rx_queue_add_kobject(struct net_device *dev, int index) 
	error = kobject_init_and_add(kobj, &rx_queue_ktype, NULL,

	    "rx-%u", index);

	if (error)

		goto exit;

		return error;



	if (dev->sysfs_rx_queue_group) {

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

		if (error)

			goto exit;

		if (error) {

			kobject_put(kobj);

			return error;

		}

	}



	kobject_uevent(kobj, KOBJ_ADD);

	dev_hold(queue->dev);



	return error;

exit:

	kobject_put(kobj);

	return error;

}

#endif /* CONFIG_SYSFS */
@@ -1339,21 +1338,20 @@ static int netdev_queue_add_kobject(struct net_device *dev, int index) 
	error = kobject_init_and_add(kobj, &netdev_queue_ktype, NULL,

	    "tx-%u", index);

	if (error)

		goto exit;

		return error;



#ifdef CONFIG_BQL

	error = sysfs_create_group(kobj, &dql_group);

	if (error)

		goto exit;

	if (error) {

		kobject_put(kobj);

		return error;

	}

#endif



	kobject_uevent(kobj, KOBJ_ADD);

	dev_hold(queue->dev);



	return 0;

exit:

	kobject_put(kobj);

	return error;

}

#endif /* CONFIG_SYSFS */

CRA Git | Maintained and supported by SUSTech CRA and CCSE