Commit 8ed633b9 authored Apr 12, 2019 by Wang Hai Committed by David S. Miller Apr 15, 2019

Revert "net-sysfs: Fix memory leak in netdev_register_kobject"

This reverts commit 6b70fc94.

The reverted bugfix will cause another issue.
Reported by syzbot+6024817a931b2830bc93@syzkaller.appspotmail.com.
See https://syzkaller.appspot.com/x/log.txt?x=1737671b200000

 for
details.

Signed-off-by: Wang Hai <wanghai26@huawei.com>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

parent a44acf90

net/core/net-sysfs.c

+5 −9

Original line number	Diff line number	Diff line
		@@ -1747,20 +1747,16 @@ int netdev_register_kobject(struct net_device *ndev)

		error = device_add(dev);
		if (error)
		goto error_put_device;
		return error;

		error = register_queue_kobjects(ndev);
		if (error)
		goto error_device_del;
		if (error) {
		device_del(dev);
		return error;
		}

		pm_runtime_set_memalloc_noio(dev, true);

		return 0;

		error_device_del:
		device_del(dev);
		error_put_device:
		put_device(dev);
		return error;
		}

Admin message