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

Commit 60d671da authored by Jouni Hogander's avatar Jouni Hogander Committed by Greg Kroah-Hartman
Browse files

net-sysfs: Call dev_hold always in netdev_queue_add_kobject 



[ Upstream commit e0b60903b434a7ee21ba8d8659f207ed84101e89 ]

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: default avatarHulk 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: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 465b10fe

net/core/net-sysfs.c

+5 −2
Original line number Diff line number Diff line
@@ -1462,14 +1462,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)