Skip to content

Commit 60d671d

Browse files
hogander-unikiegregkh
authored andcommitted
net-sysfs: Call dev_hold always in netdev_queue_add_kobject
[ Upstream commit e0b6090 ] 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: b8eb718 ("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> Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 465b10f commit 60d671d

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

net/core/net-sysfs.c

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1462,14 +1462,17 @@ static int netdev_queue_add_kobject(struct net_device *dev, int index)
14621462
struct kobject *kobj = &queue->kobj;
14631463
int error = 0;
14641464

1465+
/* Kobject_put later will trigger netdev_queue_release call
1466+
* which decreases dev refcount: Take that reference here
1467+
*/
1468+
dev_hold(queue->dev);
1469+
14651470
kobj->kset = dev->queues_kset;
14661471
error = kobject_init_and_add(kobj, &netdev_queue_ktype, NULL,
14671472
"tx-%u", index);
14681473
if (error)
14691474
goto err;
14701475

1471-
dev_hold(queue->dev);
1472-
14731476
#ifdef CONFIG_BQL
14741477
error = sysfs_create_group(kobj, &dql_group);
14751478
if (error)

0 commit comments

Comments
 (0)