Commit e0b60903 authored Dec 05, 2019 by Jouni Hogander Committed by David S. Miller Dec 06, 2019

net-sysfs: Call dev_hold always in netdev_queue_add_kobject

Dev_hold has to be called always in netdev_queue_add_kobject.
Otherwise usage count drops below 0 in case of failure in
kobject_init_and_add.

Fixes: b8eb7183 ("net-sysfs: Fix reference count leak in rx|netdev_queue_add_kobject")
Reported-by: Hulk Robot <hulkci@huawei.com>
Cc: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Cc: David Miller <davem@davemloft.net>
Cc: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent 8bef0af0

net/core/net-sysfs.c

+5 −2

Original line number	Diff line number	Diff line
		@@ -1459,14 +1459,17 @@ static int netdev_queue_add_kobject(struct net_device *dev, int index)
		struct kobject *kobj = &queue->kobj;
		int error = 0;

		/* Kobject_put later will trigger netdev_queue_release call
		* which decreases dev refcount: Take that reference here
		*/
		dev_hold(queue->dev);

		kobj->kset = dev->queues_kset;
		error = kobject_init_and_add(kobj, &netdev_queue_ktype, NULL,
		"tx-%u", index);
		if (error)
		goto err;

		dev_hold(queue->dev);

		#ifdef CONFIG_BQL
		error = sysfs_create_group(kobj, &dql_group);
		if (error)

Admin message