From: Greg Kroah-Hartman Date: Fri, 29 Mar 2019 06:20:33 +0000 (+0100) Subject: drop net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch X-Git-Tag: v3.18.138~65 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b5a1057f045807e670f7ac527d50670608a45c45;p=thirdparty%2Fkernel%2Fstable-queue.git drop net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch --- diff --git a/queue-3.18/net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch b/queue-3.18/net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch deleted file mode 100644 index 5dc2e72f095..00000000000 --- a/queue-3.18/net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch +++ /dev/null @@ -1,86 +0,0 @@ -From foo@baz Thu Mar 28 23:25:55 CET 2019 -From: Wang Hai -Date: Wed, 20 Mar 2019 14:25:05 -0400 -Subject: net-sysfs: Fix memory leak in netdev_register_kobject - -From: Wang Hai - -[ Upstream commit 6b70fc94afd165342876e53fc4b2f7d085009945 ] - -When registering struct net_device, it will call - register_netdevice -> - netdev_register_kobject -> - device_initialize(dev); - dev_set_name(dev, "%s", ndev->name) - device_add(dev) - register_queue_kobjects(ndev) - -In netdev_register_kobject(), if device_add(dev) or -register_queue_kobjects(ndev) failed. Register_netdevice() -will return error, causing netdev_freemem(ndev) to be -called to free net_device, however put_device(&dev->dev)->..-> -kobject_cleanup() won't be called, resulting in a memory leak. - -syzkaller report this: -BUG: memory leak -unreferenced object 0xffff8881f4fad168 (size 8): -comm "syz-executor.0", pid 3575, jiffies 4294778002 (age 20.134s) -hex dump (first 8 bytes): - 77 70 61 6e 30 00 ff ff wpan0... -backtrace: - [<000000006d2d91d7>] kstrdup_const+0x3d/0x50 mm/util.c:73 - [<00000000ba9ff953>] kvasprintf_const+0x112/0x170 lib/kasprintf.c:48 - [<000000005555ec09>] kobject_set_name_vargs+0x55/0x130 lib/kobject.c:281 - [<0000000098d28ec3>] dev_set_name+0xbb/0xf0 drivers/base/core.c:1915 - [<00000000b7553017>] netdev_register_kobject+0xc0/0x410 net/core/net-sysfs.c:1727 - [<00000000c826a797>] register_netdevice+0xa51/0xeb0 net/core/dev.c:8711 - [<00000000857bfcfd>] cfg802154_update_iface_num.isra.2+0x13/0x90 [ieee802154] - [<000000003126e453>] ieee802154_llsec_fill_key_id+0x1d5/0x570 [ieee802154] - [<00000000e4b3df51>] 0xffffffffc1500e0e - [<00000000b4319776>] platform_drv_probe+0xc6/0x180 drivers/base/platform.c:614 - [<0000000037669347>] really_probe+0x491/0x7c0 drivers/base/dd.c:509 - [<000000008fed8862>] driver_probe_device+0xdc/0x240 drivers/base/dd.c:671 - [<00000000baf52041>] device_driver_attach+0xf2/0x130 drivers/base/dd.c:945 - [<00000000c7cc8dec>] __driver_attach+0x10e/0x210 drivers/base/dd.c:1022 - [<0000000057a757c2>] bus_for_each_dev+0x154/0x1e0 drivers/base/bus.c:304 - [<000000005f5ae04b>] bus_add_driver+0x427/0x5e0 drivers/base/bus.c:645 - -Reported-by: Hulk Robot -Fixes: 1fa5ae857bb1 ("driver core: get rid of struct device's bus_id string array") -Signed-off-by: Wang Hai -Reviewed-by: Andy Shevchenko -Reviewed-by: Stephen Hemminger -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - net/core/net-sysfs.c | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - ---- a/net/core/net-sysfs.c -+++ b/net/core/net-sysfs.c -@@ -1398,16 +1398,20 @@ int netdev_register_kobject(struct net_d - - error = device_add(dev); - if (error) -- return error; -+ goto error_put_device; - - error = register_queue_kobjects(ndev); -- if (error) { -- device_del(dev); -- return error; -- } -+ if (error) -+ goto error_device_del; - - pm_runtime_set_memalloc_noio(dev, true); - -+ return 0; -+ -+error_device_del: -+ device_del(dev); -+error_put_device: -+ put_device(dev); - return error; - } - diff --git a/queue-3.18/series b/queue-3.18/series index 17c58baca4d..c85633a813d 100644 --- a/queue-3.18/series +++ b/queue-3.18/series @@ -29,7 +29,6 @@ dccp-do-not-use-ipv6-header-for-ipv4-flow.patch misdn-hfcpci-test-both-vendor-device-id-for-digium-hfc4s.patch net-packet-set-__gfp_nowarn-upon-allocation-in-alloc_pg_vec.patch net-rose-fix-a-possible-stack-overflow.patch -net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch add-hlist_add_tail_rcu-merge-git-git.kernel.org-pub-scm-linux-kernel-git-davem-net.patch packets-always-register-packet-sk-in-the-same-order.patch tcp-do-not-use-ipv6-header-for-ipv4-flow.patch diff --git a/queue-4.14/net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch b/queue-4.14/net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch deleted file mode 100644 index 53805128d3a..00000000000 --- a/queue-4.14/net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch +++ /dev/null @@ -1,86 +0,0 @@ -From foo@baz Thu Mar 28 21:57:57 CET 2019 -From: Wang Hai -Date: Wed, 20 Mar 2019 14:25:05 -0400 -Subject: net-sysfs: Fix memory leak in netdev_register_kobject - -From: Wang Hai - -[ Upstream commit 6b70fc94afd165342876e53fc4b2f7d085009945 ] - -When registering struct net_device, it will call - register_netdevice -> - netdev_register_kobject -> - device_initialize(dev); - dev_set_name(dev, "%s", ndev->name) - device_add(dev) - register_queue_kobjects(ndev) - -In netdev_register_kobject(), if device_add(dev) or -register_queue_kobjects(ndev) failed. Register_netdevice() -will return error, causing netdev_freemem(ndev) to be -called to free net_device, however put_device(&dev->dev)->..-> -kobject_cleanup() won't be called, resulting in a memory leak. - -syzkaller report this: -BUG: memory leak -unreferenced object 0xffff8881f4fad168 (size 8): -comm "syz-executor.0", pid 3575, jiffies 4294778002 (age 20.134s) -hex dump (first 8 bytes): - 77 70 61 6e 30 00 ff ff wpan0... -backtrace: - [<000000006d2d91d7>] kstrdup_const+0x3d/0x50 mm/util.c:73 - [<00000000ba9ff953>] kvasprintf_const+0x112/0x170 lib/kasprintf.c:48 - [<000000005555ec09>] kobject_set_name_vargs+0x55/0x130 lib/kobject.c:281 - [<0000000098d28ec3>] dev_set_name+0xbb/0xf0 drivers/base/core.c:1915 - [<00000000b7553017>] netdev_register_kobject+0xc0/0x410 net/core/net-sysfs.c:1727 - [<00000000c826a797>] register_netdevice+0xa51/0xeb0 net/core/dev.c:8711 - [<00000000857bfcfd>] cfg802154_update_iface_num.isra.2+0x13/0x90 [ieee802154] - [<000000003126e453>] ieee802154_llsec_fill_key_id+0x1d5/0x570 [ieee802154] - [<00000000e4b3df51>] 0xffffffffc1500e0e - [<00000000b4319776>] platform_drv_probe+0xc6/0x180 drivers/base/platform.c:614 - [<0000000037669347>] really_probe+0x491/0x7c0 drivers/base/dd.c:509 - [<000000008fed8862>] driver_probe_device+0xdc/0x240 drivers/base/dd.c:671 - [<00000000baf52041>] device_driver_attach+0xf2/0x130 drivers/base/dd.c:945 - [<00000000c7cc8dec>] __driver_attach+0x10e/0x210 drivers/base/dd.c:1022 - [<0000000057a757c2>] bus_for_each_dev+0x154/0x1e0 drivers/base/bus.c:304 - [<000000005f5ae04b>] bus_add_driver+0x427/0x5e0 drivers/base/bus.c:645 - -Reported-by: Hulk Robot -Fixes: 1fa5ae857bb1 ("driver core: get rid of struct device's bus_id string array") -Signed-off-by: Wang Hai -Reviewed-by: Andy Shevchenko -Reviewed-by: Stephen Hemminger -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - net/core/net-sysfs.c | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - ---- a/net/core/net-sysfs.c -+++ b/net/core/net-sysfs.c -@@ -1598,16 +1598,20 @@ int netdev_register_kobject(struct net_d - - error = device_add(dev); - if (error) -- return error; -+ goto error_put_device; - - error = register_queue_kobjects(ndev); -- if (error) { -- device_del(dev); -- return error; -- } -+ if (error) -+ goto error_device_del; - - pm_runtime_set_memalloc_noio(dev, true); - -+ return 0; -+ -+error_device_del: -+ device_del(dev); -+error_put_device: -+ put_device(dev); - return error; - } - diff --git a/queue-4.14/series b/queue-4.14/series index 5374814feb5..c563c3924c0 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -10,7 +10,6 @@ net-packet-set-__gfp_nowarn-upon-allocation-in-alloc_pg_vec.patch net-rose-fix-a-possible-stack-overflow.patch net-stmmac-fix-memory-corruption-with-large-mtus.patch net-sysfs-call-dev_hold-if-kobject_init_and_add-success.patch -net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch packets-always-register-packet-sk-in-the-same-order.patch rhashtable-still-do-rehash-when-we-get-eexist.patch tcp-do-not-use-ipv6-header-for-ipv4-flow.patch diff --git a/queue-4.19/net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch b/queue-4.19/net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch deleted file mode 100644 index 1a2686b530a..00000000000 --- a/queue-4.19/net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch +++ /dev/null @@ -1,86 +0,0 @@ -From foo@baz Thu Mar 28 21:54:17 CET 2019 -From: Wang Hai -Date: Wed, 20 Mar 2019 14:25:05 -0400 -Subject: net-sysfs: Fix memory leak in netdev_register_kobject - -From: Wang Hai - -[ Upstream commit 6b70fc94afd165342876e53fc4b2f7d085009945 ] - -When registering struct net_device, it will call - register_netdevice -> - netdev_register_kobject -> - device_initialize(dev); - dev_set_name(dev, "%s", ndev->name) - device_add(dev) - register_queue_kobjects(ndev) - -In netdev_register_kobject(), if device_add(dev) or -register_queue_kobjects(ndev) failed. Register_netdevice() -will return error, causing netdev_freemem(ndev) to be -called to free net_device, however put_device(&dev->dev)->..-> -kobject_cleanup() won't be called, resulting in a memory leak. - -syzkaller report this: -BUG: memory leak -unreferenced object 0xffff8881f4fad168 (size 8): -comm "syz-executor.0", pid 3575, jiffies 4294778002 (age 20.134s) -hex dump (first 8 bytes): - 77 70 61 6e 30 00 ff ff wpan0... -backtrace: - [<000000006d2d91d7>] kstrdup_const+0x3d/0x50 mm/util.c:73 - [<00000000ba9ff953>] kvasprintf_const+0x112/0x170 lib/kasprintf.c:48 - [<000000005555ec09>] kobject_set_name_vargs+0x55/0x130 lib/kobject.c:281 - [<0000000098d28ec3>] dev_set_name+0xbb/0xf0 drivers/base/core.c:1915 - [<00000000b7553017>] netdev_register_kobject+0xc0/0x410 net/core/net-sysfs.c:1727 - [<00000000c826a797>] register_netdevice+0xa51/0xeb0 net/core/dev.c:8711 - [<00000000857bfcfd>] cfg802154_update_iface_num.isra.2+0x13/0x90 [ieee802154] - [<000000003126e453>] ieee802154_llsec_fill_key_id+0x1d5/0x570 [ieee802154] - [<00000000e4b3df51>] 0xffffffffc1500e0e - [<00000000b4319776>] platform_drv_probe+0xc6/0x180 drivers/base/platform.c:614 - [<0000000037669347>] really_probe+0x491/0x7c0 drivers/base/dd.c:509 - [<000000008fed8862>] driver_probe_device+0xdc/0x240 drivers/base/dd.c:671 - [<00000000baf52041>] device_driver_attach+0xf2/0x130 drivers/base/dd.c:945 - [<00000000c7cc8dec>] __driver_attach+0x10e/0x210 drivers/base/dd.c:1022 - [<0000000057a757c2>] bus_for_each_dev+0x154/0x1e0 drivers/base/bus.c:304 - [<000000005f5ae04b>] bus_add_driver+0x427/0x5e0 drivers/base/bus.c:645 - -Reported-by: Hulk Robot -Fixes: 1fa5ae857bb1 ("driver core: get rid of struct device's bus_id string array") -Signed-off-by: Wang Hai -Reviewed-by: Andy Shevchenko -Reviewed-by: Stephen Hemminger -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - net/core/net-sysfs.c | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - ---- a/net/core/net-sysfs.c -+++ b/net/core/net-sysfs.c -@@ -1755,16 +1755,20 @@ int netdev_register_kobject(struct net_d - - error = device_add(dev); - if (error) -- return error; -+ goto error_put_device; - - error = register_queue_kobjects(ndev); -- if (error) { -- device_del(dev); -- return error; -- } -+ if (error) -+ goto error_device_del; - - pm_runtime_set_memalloc_noio(dev, true); - -+ return 0; -+ -+error_device_del: -+ device_del(dev); -+error_put_device: -+ put_device(dev); - return error; - } - diff --git a/queue-4.19/series b/queue-4.19/series index ff6530a0eb8..2a3d0008ba8 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -14,7 +14,6 @@ net-phy-meson-gxl-fix-interrupt-support.patch net-rose-fix-a-possible-stack-overflow.patch net-stmmac-fix-memory-corruption-with-large-mtus.patch net-sysfs-call-dev_hold-if-kobject_init_and_add-success.patch -net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch packets-always-register-packet-sk-in-the-same-order.patch rhashtable-still-do-rehash-when-we-get-eexist.patch sctp-get-sctphdr-by-offset-in-sctp_compute_cksum.patch diff --git a/queue-4.4/net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch b/queue-4.4/net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch deleted file mode 100644 index 975699f199a..00000000000 --- a/queue-4.4/net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch +++ /dev/null @@ -1,86 +0,0 @@ -From foo@baz Thu Mar 28 23:13:19 CET 2019 -From: Wang Hai -Date: Wed, 20 Mar 2019 14:25:05 -0400 -Subject: net-sysfs: Fix memory leak in netdev_register_kobject - -From: Wang Hai - -[ Upstream commit 6b70fc94afd165342876e53fc4b2f7d085009945 ] - -When registering struct net_device, it will call - register_netdevice -> - netdev_register_kobject -> - device_initialize(dev); - dev_set_name(dev, "%s", ndev->name) - device_add(dev) - register_queue_kobjects(ndev) - -In netdev_register_kobject(), if device_add(dev) or -register_queue_kobjects(ndev) failed. Register_netdevice() -will return error, causing netdev_freemem(ndev) to be -called to free net_device, however put_device(&dev->dev)->..-> -kobject_cleanup() won't be called, resulting in a memory leak. - -syzkaller report this: -BUG: memory leak -unreferenced object 0xffff8881f4fad168 (size 8): -comm "syz-executor.0", pid 3575, jiffies 4294778002 (age 20.134s) -hex dump (first 8 bytes): - 77 70 61 6e 30 00 ff ff wpan0... -backtrace: - [<000000006d2d91d7>] kstrdup_const+0x3d/0x50 mm/util.c:73 - [<00000000ba9ff953>] kvasprintf_const+0x112/0x170 lib/kasprintf.c:48 - [<000000005555ec09>] kobject_set_name_vargs+0x55/0x130 lib/kobject.c:281 - [<0000000098d28ec3>] dev_set_name+0xbb/0xf0 drivers/base/core.c:1915 - [<00000000b7553017>] netdev_register_kobject+0xc0/0x410 net/core/net-sysfs.c:1727 - [<00000000c826a797>] register_netdevice+0xa51/0xeb0 net/core/dev.c:8711 - [<00000000857bfcfd>] cfg802154_update_iface_num.isra.2+0x13/0x90 [ieee802154] - [<000000003126e453>] ieee802154_llsec_fill_key_id+0x1d5/0x570 [ieee802154] - [<00000000e4b3df51>] 0xffffffffc1500e0e - [<00000000b4319776>] platform_drv_probe+0xc6/0x180 drivers/base/platform.c:614 - [<0000000037669347>] really_probe+0x491/0x7c0 drivers/base/dd.c:509 - [<000000008fed8862>] driver_probe_device+0xdc/0x240 drivers/base/dd.c:671 - [<00000000baf52041>] device_driver_attach+0xf2/0x130 drivers/base/dd.c:945 - [<00000000c7cc8dec>] __driver_attach+0x10e/0x210 drivers/base/dd.c:1022 - [<0000000057a757c2>] bus_for_each_dev+0x154/0x1e0 drivers/base/bus.c:304 - [<000000005f5ae04b>] bus_add_driver+0x427/0x5e0 drivers/base/bus.c:645 - -Reported-by: Hulk Robot -Fixes: 1fa5ae857bb1 ("driver core: get rid of struct device's bus_id string array") -Signed-off-by: Wang Hai -Reviewed-by: Andy Shevchenko -Reviewed-by: Stephen Hemminger -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - net/core/net-sysfs.c | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - ---- a/net/core/net-sysfs.c -+++ b/net/core/net-sysfs.c -@@ -1551,16 +1551,20 @@ int netdev_register_kobject(struct net_d - - error = device_add(dev); - if (error) -- return error; -+ goto error_put_device; - - error = register_queue_kobjects(ndev); -- if (error) { -- device_del(dev); -- return error; -- } -+ if (error) -+ goto error_device_del; - - pm_runtime_set_memalloc_noio(dev, true); - -+ return 0; -+ -+error_device_del: -+ device_del(dev); -+error_put_device: -+ put_device(dev); - return error; - } - diff --git a/queue-4.4/series b/queue-4.4/series index 682da457807..884909c7956 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -91,7 +91,6 @@ dccp-do-not-use-ipv6-header-for-ipv4-flow.patch misdn-hfcpci-test-both-vendor-device-id-for-digium-hfc4s.patch net-packet-set-__gfp_nowarn-upon-allocation-in-alloc_pg_vec.patch net-rose-fix-a-possible-stack-overflow.patch -net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch add-hlist_add_tail_rcu-merge-git-git.kernel.org-pub-scm-linux-kernel-git-davem-net.patch packets-always-register-packet-sk-in-the-same-order.patch tcp-do-not-use-ipv6-header-for-ipv4-flow.patch diff --git a/queue-4.9/net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch b/queue-4.9/net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch deleted file mode 100644 index 50e86ac5259..00000000000 --- a/queue-4.9/net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch +++ /dev/null @@ -1,86 +0,0 @@ -From foo@baz Thu Mar 28 23:00:38 CET 2019 -From: Wang Hai -Date: Wed, 20 Mar 2019 14:25:05 -0400 -Subject: net-sysfs: Fix memory leak in netdev_register_kobject - -From: Wang Hai - -[ Upstream commit 6b70fc94afd165342876e53fc4b2f7d085009945 ] - -When registering struct net_device, it will call - register_netdevice -> - netdev_register_kobject -> - device_initialize(dev); - dev_set_name(dev, "%s", ndev->name) - device_add(dev) - register_queue_kobjects(ndev) - -In netdev_register_kobject(), if device_add(dev) or -register_queue_kobjects(ndev) failed. Register_netdevice() -will return error, causing netdev_freemem(ndev) to be -called to free net_device, however put_device(&dev->dev)->..-> -kobject_cleanup() won't be called, resulting in a memory leak. - -syzkaller report this: -BUG: memory leak -unreferenced object 0xffff8881f4fad168 (size 8): -comm "syz-executor.0", pid 3575, jiffies 4294778002 (age 20.134s) -hex dump (first 8 bytes): - 77 70 61 6e 30 00 ff ff wpan0... -backtrace: - [<000000006d2d91d7>] kstrdup_const+0x3d/0x50 mm/util.c:73 - [<00000000ba9ff953>] kvasprintf_const+0x112/0x170 lib/kasprintf.c:48 - [<000000005555ec09>] kobject_set_name_vargs+0x55/0x130 lib/kobject.c:281 - [<0000000098d28ec3>] dev_set_name+0xbb/0xf0 drivers/base/core.c:1915 - [<00000000b7553017>] netdev_register_kobject+0xc0/0x410 net/core/net-sysfs.c:1727 - [<00000000c826a797>] register_netdevice+0xa51/0xeb0 net/core/dev.c:8711 - [<00000000857bfcfd>] cfg802154_update_iface_num.isra.2+0x13/0x90 [ieee802154] - [<000000003126e453>] ieee802154_llsec_fill_key_id+0x1d5/0x570 [ieee802154] - [<00000000e4b3df51>] 0xffffffffc1500e0e - [<00000000b4319776>] platform_drv_probe+0xc6/0x180 drivers/base/platform.c:614 - [<0000000037669347>] really_probe+0x491/0x7c0 drivers/base/dd.c:509 - [<000000008fed8862>] driver_probe_device+0xdc/0x240 drivers/base/dd.c:671 - [<00000000baf52041>] device_driver_attach+0xf2/0x130 drivers/base/dd.c:945 - [<00000000c7cc8dec>] __driver_attach+0x10e/0x210 drivers/base/dd.c:1022 - [<0000000057a757c2>] bus_for_each_dev+0x154/0x1e0 drivers/base/bus.c:304 - [<000000005f5ae04b>] bus_add_driver+0x427/0x5e0 drivers/base/bus.c:645 - -Reported-by: Hulk Robot -Fixes: 1fa5ae857bb1 ("driver core: get rid of struct device's bus_id string array") -Signed-off-by: Wang Hai -Reviewed-by: Andy Shevchenko -Reviewed-by: Stephen Hemminger -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - net/core/net-sysfs.c | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - ---- a/net/core/net-sysfs.c -+++ b/net/core/net-sysfs.c -@@ -1570,16 +1570,20 @@ int netdev_register_kobject(struct net_d - - error = device_add(dev); - if (error) -- return error; -+ goto error_put_device; - - error = register_queue_kobjects(ndev); -- if (error) { -- device_del(dev); -- return error; -- } -+ if (error) -+ goto error_device_del; - - pm_runtime_set_memalloc_noio(dev, true); - -+ return 0; -+ -+error_device_del: -+ device_del(dev); -+error_put_device: -+ put_device(dev); - return error; - } - diff --git a/queue-4.9/series b/queue-4.9/series index a3053acd72b..ad6791f7d10 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -7,7 +7,6 @@ dccp-do-not-use-ipv6-header-for-ipv4-flow.patch misdn-hfcpci-test-both-vendor-device-id-for-digium-hfc4s.patch net-packet-set-__gfp_nowarn-upon-allocation-in-alloc_pg_vec.patch net-rose-fix-a-possible-stack-overflow.patch -net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch packets-always-register-packet-sk-in-the-same-order.patch tcp-do-not-use-ipv6-header-for-ipv4-flow.patch vxlan-don-t-call-gro_cells_destroy-before-device-is-unregistered.patch diff --git a/queue-5.0/net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch b/queue-5.0/net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch deleted file mode 100644 index 4d0ca04f498..00000000000 --- a/queue-5.0/net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch +++ /dev/null @@ -1,86 +0,0 @@ -From foo@baz Thu Mar 28 21:53:58 CET 2019 -From: Wang Hai -Date: Wed, 20 Mar 2019 14:25:05 -0400 -Subject: net-sysfs: Fix memory leak in netdev_register_kobject - -From: Wang Hai - -[ Upstream commit 6b70fc94afd165342876e53fc4b2f7d085009945 ] - -When registering struct net_device, it will call - register_netdevice -> - netdev_register_kobject -> - device_initialize(dev); - dev_set_name(dev, "%s", ndev->name) - device_add(dev) - register_queue_kobjects(ndev) - -In netdev_register_kobject(), if device_add(dev) or -register_queue_kobjects(ndev) failed. Register_netdevice() -will return error, causing netdev_freemem(ndev) to be -called to free net_device, however put_device(&dev->dev)->..-> -kobject_cleanup() won't be called, resulting in a memory leak. - -syzkaller report this: -BUG: memory leak -unreferenced object 0xffff8881f4fad168 (size 8): -comm "syz-executor.0", pid 3575, jiffies 4294778002 (age 20.134s) -hex dump (first 8 bytes): - 77 70 61 6e 30 00 ff ff wpan0... -backtrace: - [<000000006d2d91d7>] kstrdup_const+0x3d/0x50 mm/util.c:73 - [<00000000ba9ff953>] kvasprintf_const+0x112/0x170 lib/kasprintf.c:48 - [<000000005555ec09>] kobject_set_name_vargs+0x55/0x130 lib/kobject.c:281 - [<0000000098d28ec3>] dev_set_name+0xbb/0xf0 drivers/base/core.c:1915 - [<00000000b7553017>] netdev_register_kobject+0xc0/0x410 net/core/net-sysfs.c:1727 - [<00000000c826a797>] register_netdevice+0xa51/0xeb0 net/core/dev.c:8711 - [<00000000857bfcfd>] cfg802154_update_iface_num.isra.2+0x13/0x90 [ieee802154] - [<000000003126e453>] ieee802154_llsec_fill_key_id+0x1d5/0x570 [ieee802154] - [<00000000e4b3df51>] 0xffffffffc1500e0e - [<00000000b4319776>] platform_drv_probe+0xc6/0x180 drivers/base/platform.c:614 - [<0000000037669347>] really_probe+0x491/0x7c0 drivers/base/dd.c:509 - [<000000008fed8862>] driver_probe_device+0xdc/0x240 drivers/base/dd.c:671 - [<00000000baf52041>] device_driver_attach+0xf2/0x130 drivers/base/dd.c:945 - [<00000000c7cc8dec>] __driver_attach+0x10e/0x210 drivers/base/dd.c:1022 - [<0000000057a757c2>] bus_for_each_dev+0x154/0x1e0 drivers/base/bus.c:304 - [<000000005f5ae04b>] bus_add_driver+0x427/0x5e0 drivers/base/bus.c:645 - -Reported-by: Hulk Robot -Fixes: 1fa5ae857bb1 ("driver core: get rid of struct device's bus_id string array") -Signed-off-by: Wang Hai -Reviewed-by: Andy Shevchenko -Reviewed-by: Stephen Hemminger -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - net/core/net-sysfs.c | 14 +++++++++----- - 1 file changed, 9 insertions(+), 5 deletions(-) - ---- a/net/core/net-sysfs.c -+++ b/net/core/net-sysfs.c -@@ -1755,16 +1755,20 @@ int netdev_register_kobject(struct net_d - - error = device_add(dev); - if (error) -- return error; -+ goto error_put_device; - - error = register_queue_kobjects(ndev); -- if (error) { -- device_del(dev); -- return error; -- } -+ if (error) -+ goto error_device_del; - - pm_runtime_set_memalloc_noio(dev, true); - -+ return 0; -+ -+error_device_del: -+ device_del(dev); -+error_put_device: -+ put_device(dev); - return error; - } - diff --git a/queue-5.0/series b/queue-5.0/series index 15ab6945d66..35c66188fa4 100644 --- a/queue-5.0/series +++ b/queue-5.0/series @@ -14,7 +14,6 @@ net-phy-meson-gxl-fix-interrupt-support.patch net-rose-fix-a-possible-stack-overflow.patch net-stmmac-fix-memory-corruption-with-large-mtus.patch net-sysfs-call-dev_hold-if-kobject_init_and_add-success.patch -net-sysfs-fix-memory-leak-in-netdev_register_kobject.patch net-usb-aqc111-extend-hwid-table-by-qnap-device.patch packets-always-register-packet-sk-in-the-same-order.patch rhashtable-still-do-rehash-when-we-get-eexist.patch