diff options
| author |   Wang Hai <wanghai26@huawei.com> | 2019-04-12 16:36:33 -0400 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-04-15 13:10:27 -0700 |
| commit | 8ed633b9baf9ec7d593ebb8e256312ff1c70ab37 (patch) | |
| tree | b62028b8430e093961cb7ece88cc8a9ad2dc902a /net/core/net-sysfs.c | |
| parent | Merge tag 'wireless-drivers-for-davem-2019-04-15' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers (diff) | |
| download | linux-dev-8ed633b9baf9ec7d593ebb8e256312ff1c70ab37.tar.xz linux-dev-8ed633b9baf9ec7d593ebb8e256312ff1c70ab37.zip | |
Revert "net-sysfs: Fix memory leak in netdev_register_kobject"
This reverts commit 6b70fc94afd165342876e53fc4b2f7d085009945.
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>
Diffstat (limited to 'net/core/net-sysfs.c')
| -rw-r--r-- | net/core/net-sysfs.c | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/net/core/net-sysfs.c b/net/core/net-sysfs.c index f8f94303a1f5..8f8b7b6c2945 100644 --- a/net/core/net-sysfs.c +++ b/net/core/net-sysfs.c @@ -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; } |