Skip to content

Commit 8ed633b

Browse files
Wang Haidavem330
authored andcommitted
Revert "net-sysfs: Fix memory leak in netdev_register_kobject"
This reverts commit 6b70fc9. The reverted bugfix will cause another issue. Reported by [email protected]. See https://syzkaller.appspot.com/x/log.txt?x=1737671b200000 for details. Signed-off-by: Wang Hai <[email protected]> Acked-by: Andy Shevchenko <[email protected]> Signed-off-by: David S. Miller <[email protected]>
1 parent a44acf9 commit 8ed633b

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

net/core/net-sysfs.c

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1747,20 +1747,16 @@ int netdev_register_kobject(struct net_device *ndev)
17471747

17481748
error = device_add(dev);
17491749
if (error)
1750-
goto error_put_device;
1750+
return error;
17511751

17521752
error = register_queue_kobjects(ndev);
1753-
if (error)
1754-
goto error_device_del;
1753+
if (error) {
1754+
device_del(dev);
1755+
return error;
1756+
}
17551757

17561758
pm_runtime_set_memalloc_noio(dev, true);
17571759

1758-
return 0;
1759-
1760-
error_device_del:
1761-
device_del(dev);
1762-
error_put_device:
1763-
put_device(dev);
17641760
return error;
17651761
}
17661762

0 commit comments

Comments
 (0)