From: Greg Kroah-Hartman Date: Fri, 29 Nov 2019 08:57:07 +0000 (+0100) Subject: drop net-sysfs fix patches from 4.14, 4.19, and 5.3 queues X-Git-Tag: v5.3.14~1 X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=443aac4b2e83fe5c03a68d28b0d1affefb7d5050;p=thirdparty%2Fkernel%2Fstable-queue.git drop net-sysfs fix patches from 4.14, 4.19, and 5.3 queues They don't seem to be working yet :( Signed-off-by: Greg Kroah-Hartman --- diff --git a/queue-4.14/net-sysfs-fix-netdev_queue_add_kobject-breakage.patch b/queue-4.14/net-sysfs-fix-netdev_queue_add_kobject-breakage.patch deleted file mode 100644 index 0ce88f10980..00000000000 --- a/queue-4.14/net-sysfs-fix-netdev_queue_add_kobject-breakage.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 48a322b6f9965b2f1e4ce81af972f0e287b07ed0 Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Wed, 20 Nov 2019 19:19:07 -0800 -Subject: net-sysfs: fix netdev_queue_add_kobject() breakage - -From: Eric Dumazet - -commit 48a322b6f9965b2f1e4ce81af972f0e287b07ed0 upstream. - -kobject_put() should only be called in error path. - -Fixes: b8eb718348b8 ("net-sysfs: Fix reference count leak in rx|netdev_queue_add_kobject") -Signed-off-by: Eric Dumazet -Cc: Jouni Hogander -Signed-off-by: David S. Miller -Cc: Nobuhiro Iwamatsu -Cc: Naresh Kamboju -Signed-off-by: Greg Kroah-Hartman - ---- - net/core/net-sysfs.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/net/core/net-sysfs.c -+++ b/net/core/net-sysfs.c -@@ -1339,6 +1339,7 @@ static int netdev_queue_add_kobject(stru - #endif - - kobject_uevent(kobj, KOBJ_ADD); -+ return 0; - - err: - kobject_put(kobj); diff --git a/queue-4.14/net-sysfs-fix-reference-count-leak-in-rx-netdev_queue_add_kobject.patch b/queue-4.14/net-sysfs-fix-reference-count-leak-in-rx-netdev_queue_add_kobject.patch deleted file mode 100644 index 5934d89d0f1..00000000000 --- a/queue-4.14/net-sysfs-fix-reference-count-leak-in-rx-netdev_queue_add_kobject.patch +++ /dev/null @@ -1,106 +0,0 @@ -From b8eb718348b8fb30b5a7d0a8fce26fb3f4ac741b Mon Sep 17 00:00:00 2001 -From: Jouni Hogander -Date: Wed, 20 Nov 2019 09:08:16 +0200 -Subject: net-sysfs: Fix reference count leak in rx|netdev_queue_add_kobject - -From: Jouni Hogander - -commit b8eb718348b8fb30b5a7d0a8fce26fb3f4ac741b upstream. - -kobject_init_and_add takes reference even when it fails. This has -to be given up by the caller in error handling. Otherwise memory -allocated by kobject_init_and_add is never freed. Originally found -by Syzkaller: - -BUG: memory leak -unreferenced object 0xffff8880679f8b08 (size 8): - comm "netdev_register", pid 269, jiffies 4294693094 (age 12.132s) - hex dump (first 8 bytes): - 72 78 2d 30 00 36 20 d4 rx-0.6 . - backtrace: - [<000000008c93818e>] __kmalloc_track_caller+0x16e/0x290 - [<000000001f2e4e49>] kvasprintf+0xb1/0x140 - [<000000007f313394>] kvasprintf_const+0x56/0x160 - [<00000000aeca11c8>] kobject_set_name_vargs+0x5b/0x140 - [<0000000073a0367c>] kobject_init_and_add+0xd8/0x170 - [<0000000088838e4b>] net_rx_queue_update_kobjects+0x152/0x560 - [<000000006be5f104>] netdev_register_kobject+0x210/0x380 - [<00000000e31dab9d>] register_netdevice+0xa1b/0xf00 - [<00000000f68b2465>] __tun_chr_ioctl+0x20d5/0x3dd0 - [<000000004c50599f>] tun_chr_ioctl+0x2f/0x40 - [<00000000bbd4c317>] do_vfs_ioctl+0x1c7/0x1510 - [<00000000d4c59e8f>] ksys_ioctl+0x99/0xb0 - [<00000000946aea81>] __x64_sys_ioctl+0x78/0xb0 - [<0000000038d946e5>] do_syscall_64+0x16f/0x580 - [<00000000e0aa5d8f>] entry_SYSCALL_64_after_hwframe+0x44/0xa9 - [<00000000285b3d1a>] 0xffffffffffffffff - -Cc: David Miller -Cc: Lukas Bulwahn -Signed-off-by: Jouni Hogander -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman - ---- - net/core/net-sysfs.c | 24 +++++++++++++----------- - 1 file changed, 13 insertions(+), 11 deletions(-) - ---- a/net/core/net-sysfs.c -+++ b/net/core/net-sysfs.c -@@ -915,21 +915,23 @@ static int rx_queue_add_kobject(struct n - error = kobject_init_and_add(kobj, &rx_queue_ktype, NULL, - "rx-%u", index); - if (error) -- return error; -+ goto err; - - dev_hold(queue->dev); - - if (dev->sysfs_rx_queue_group) { - error = sysfs_create_group(kobj, dev->sysfs_rx_queue_group); -- if (error) { -- kobject_put(kobj); -- return error; -- } -+ if (error) -+ goto err; - } - - kobject_uevent(kobj, KOBJ_ADD); - - return error; -+ -+err: -+ kobject_put(kobj); -+ return error; - } - #endif /* CONFIG_SYSFS */ - -@@ -1326,21 +1328,21 @@ static int netdev_queue_add_kobject(stru - error = kobject_init_and_add(kobj, &netdev_queue_ktype, NULL, - "tx-%u", index); - if (error) -- return error; -+ goto err; - - dev_hold(queue->dev); - - #ifdef CONFIG_BQL - error = sysfs_create_group(kobj, &dql_group); -- if (error) { -- kobject_put(kobj); -- return error; -- } -+ if (error) -+ goto err; - #endif - - kobject_uevent(kobj, KOBJ_ADD); - -- return 0; -+err: -+ kobject_put(kobj); -+ return error; - } - #endif /* CONFIG_SYSFS */ - diff --git a/queue-4.14/series b/queue-4.14/series index 10be7b3bc83..154f15200fc 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -183,7 +183,6 @@ selftests-x86-mov_ss_trap-fix-the-sysenter-test.patch selftests-x86-sigreturn-32-invalidate-ds-and-es-when-abusing-the-kernel.patch x86-pti-32-calculate-the-various-pti-cpu_entry_area-sizes-correctly-make-the-cpu_entry_area_pages-assert-precise.patch nfc-port100-handle-command-failure-cleanly.patch -net-sysfs-fix-reference-count-leak-in-rx-netdev_queue_add_kobject.patch media-vivid-set-vid_cap_streaming-and-vid_out_streaming-to-true.patch media-vivid-fix-wrong-locking-that-causes-race-conditions-on-streaming-stop.patch media-usbvision-fix-races-among-open-close-and-disconnect.patch @@ -208,4 +207,3 @@ powerpc-64s-support-nospectre_v2-cmdline-option.patch powerpc-book3s64-fix-link-stack-flush-on-context-switch.patch kvm-ppc-book3s-hv-flush-link-stack-on-guest-exit-to-host-kernel.patch x86-hyperv-mark-hyperv_init-as-__init-function.patch -net-sysfs-fix-netdev_queue_add_kobject-breakage.patch diff --git a/queue-4.19/net-sysfs-fix-netdev_queue_add_kobject-breakage.patch b/queue-4.19/net-sysfs-fix-netdev_queue_add_kobject-breakage.patch deleted file mode 100644 index ba64c8ab9f8..00000000000 --- a/queue-4.19/net-sysfs-fix-netdev_queue_add_kobject-breakage.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 48a322b6f9965b2f1e4ce81af972f0e287b07ed0 Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Wed, 20 Nov 2019 19:19:07 -0800 -Subject: net-sysfs: fix netdev_queue_add_kobject() breakage - -From: Eric Dumazet - -commit 48a322b6f9965b2f1e4ce81af972f0e287b07ed0 upstream. - -kobject_put() should only be called in error path. - -Fixes: b8eb718348b8 ("net-sysfs: Fix reference count leak in rx|netdev_queue_add_kobject") -Signed-off-by: Eric Dumazet -Cc: Jouni Hogander -Signed-off-by: David S. Miller -Cc: Nobuhiro Iwamatsu -Cc: Naresh Kamboju -Signed-off-by: Greg Kroah-Hartman - ---- - net/core/net-sysfs.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/net/core/net-sysfs.c -+++ b/net/core/net-sysfs.c -@@ -1484,6 +1484,7 @@ static int netdev_queue_add_kobject(stru - #endif - - kobject_uevent(kobj, KOBJ_ADD); -+ return 0; - - err: - kobject_put(kobj); diff --git a/queue-4.19/net-sysfs-fix-reference-count-leak-in-rx-netdev_queue_add_kobject.patch b/queue-4.19/net-sysfs-fix-reference-count-leak-in-rx-netdev_queue_add_kobject.patch deleted file mode 100644 index 09e4bef38e1..00000000000 --- a/queue-4.19/net-sysfs-fix-reference-count-leak-in-rx-netdev_queue_add_kobject.patch +++ /dev/null @@ -1,106 +0,0 @@ -From b8eb718348b8fb30b5a7d0a8fce26fb3f4ac741b Mon Sep 17 00:00:00 2001 -From: Jouni Hogander -Date: Wed, 20 Nov 2019 09:08:16 +0200 -Subject: net-sysfs: Fix reference count leak in rx|netdev_queue_add_kobject - -From: Jouni Hogander - -commit b8eb718348b8fb30b5a7d0a8fce26fb3f4ac741b upstream. - -kobject_init_and_add takes reference even when it fails. This has -to be given up by the caller in error handling. Otherwise memory -allocated by kobject_init_and_add is never freed. Originally found -by Syzkaller: - -BUG: memory leak -unreferenced object 0xffff8880679f8b08 (size 8): - comm "netdev_register", pid 269, jiffies 4294693094 (age 12.132s) - hex dump (first 8 bytes): - 72 78 2d 30 00 36 20 d4 rx-0.6 . - backtrace: - [<000000008c93818e>] __kmalloc_track_caller+0x16e/0x290 - [<000000001f2e4e49>] kvasprintf+0xb1/0x140 - [<000000007f313394>] kvasprintf_const+0x56/0x160 - [<00000000aeca11c8>] kobject_set_name_vargs+0x5b/0x140 - [<0000000073a0367c>] kobject_init_and_add+0xd8/0x170 - [<0000000088838e4b>] net_rx_queue_update_kobjects+0x152/0x560 - [<000000006be5f104>] netdev_register_kobject+0x210/0x380 - [<00000000e31dab9d>] register_netdevice+0xa1b/0xf00 - [<00000000f68b2465>] __tun_chr_ioctl+0x20d5/0x3dd0 - [<000000004c50599f>] tun_chr_ioctl+0x2f/0x40 - [<00000000bbd4c317>] do_vfs_ioctl+0x1c7/0x1510 - [<00000000d4c59e8f>] ksys_ioctl+0x99/0xb0 - [<00000000946aea81>] __x64_sys_ioctl+0x78/0xb0 - [<0000000038d946e5>] do_syscall_64+0x16f/0x580 - [<00000000e0aa5d8f>] entry_SYSCALL_64_after_hwframe+0x44/0xa9 - [<00000000285b3d1a>] 0xffffffffffffffff - -Cc: David Miller -Cc: Lukas Bulwahn -Signed-off-by: Jouni Hogander -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman - ---- - net/core/net-sysfs.c | 24 +++++++++++++----------- - 1 file changed, 13 insertions(+), 11 deletions(-) - ---- a/net/core/net-sysfs.c -+++ b/net/core/net-sysfs.c -@@ -932,21 +932,23 @@ static int rx_queue_add_kobject(struct n - error = kobject_init_and_add(kobj, &rx_queue_ktype, NULL, - "rx-%u", index); - if (error) -- return error; -+ goto err; - - dev_hold(queue->dev); - - if (dev->sysfs_rx_queue_group) { - error = sysfs_create_group(kobj, dev->sysfs_rx_queue_group); -- if (error) { -- kobject_put(kobj); -- return error; -- } -+ if (error) -+ goto err; - } - - kobject_uevent(kobj, KOBJ_ADD); - - return error; -+ -+err: -+ kobject_put(kobj); -+ return error; - } - #endif /* CONFIG_SYSFS */ - -@@ -1471,21 +1473,21 @@ static int netdev_queue_add_kobject(stru - error = kobject_init_and_add(kobj, &netdev_queue_ktype, NULL, - "tx-%u", index); - if (error) -- return error; -+ goto err; - - dev_hold(queue->dev); - - #ifdef CONFIG_BQL - error = sysfs_create_group(kobj, &dql_group); -- if (error) { -- kobject_put(kobj); -- return error; -- } -+ if (error) -+ goto err; - #endif - - kobject_uevent(kobj, KOBJ_ADD); - -- return 0; -+err: -+ kobject_put(kobj); -+ return error; - } - #endif /* CONFIG_SYSFS */ - diff --git a/queue-4.19/series b/queue-4.19/series index d79035fcc2c..fe7cc3c2c9f 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -278,7 +278,6 @@ y2038-futex-move-compat-implementation-into-futex.c.patch futex-prevent-robust-futex-exit-race.patch alsa-usb-audio-fix-null-dereference-at-parsing-badd.patch nfc-port100-handle-command-failure-cleanly.patch -net-sysfs-fix-reference-count-leak-in-rx-netdev_queue_add_kobject.patch media-vivid-set-vid_cap_streaming-and-vid_out_streaming-to-true.patch media-vivid-fix-wrong-locking-that-causes-race-conditions-on-streaming-stop.patch media-usbvision-fix-races-among-open-close-and-disconnect.patch @@ -303,5 +302,4 @@ staging-comedi-usbduxfast-usbduxfast_ai_cmdtest-rounding-error.patch powerpc-64s-support-nospectre_v2-cmdline-option.patch powerpc-book3s64-fix-link-stack-flush-on-context-switch.patch kvm-ppc-book3s-hv-flush-link-stack-on-guest-exit-to-host-kernel.patch -net-sysfs-fix-netdev_queue_add_kobject-breakage.patch pm-devfreq-fix-kernel-oops-on-governor-module-load.patch diff --git a/queue-5.3/net-sysfs-fix-netdev_queue_add_kobject-breakage.patch b/queue-5.3/net-sysfs-fix-netdev_queue_add_kobject-breakage.patch deleted file mode 100644 index 5ae7f2bfd75..00000000000 --- a/queue-5.3/net-sysfs-fix-netdev_queue_add_kobject-breakage.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 48a322b6f9965b2f1e4ce81af972f0e287b07ed0 Mon Sep 17 00:00:00 2001 -From: Eric Dumazet -Date: Wed, 20 Nov 2019 19:19:07 -0800 -Subject: net-sysfs: fix netdev_queue_add_kobject() breakage - -From: Eric Dumazet - -commit 48a322b6f9965b2f1e4ce81af972f0e287b07ed0 upstream. - -kobject_put() should only be called in error path. - -Fixes: b8eb718348b8 ("net-sysfs: Fix reference count leak in rx|netdev_queue_add_kobject") -Signed-off-by: Eric Dumazet -Cc: Jouni Hogander -Signed-off-by: David S. Miller -Cc: Nobuhiro Iwamatsu -Cc: Naresh Kamboju -Signed-off-by: Greg Kroah-Hartman - ---- - net/core/net-sysfs.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/net/core/net-sysfs.c -+++ b/net/core/net-sysfs.c -@@ -1474,6 +1474,7 @@ static int netdev_queue_add_kobject(stru - #endif - - kobject_uevent(kobj, KOBJ_ADD); -+ return 0; - - err: - kobject_put(kobj); diff --git a/queue-5.3/net-sysfs-fix-reference-count-leak-in-rx-netdev_queue_add_kobject.patch b/queue-5.3/net-sysfs-fix-reference-count-leak-in-rx-netdev_queue_add_kobject.patch deleted file mode 100644 index 18da03c6df8..00000000000 --- a/queue-5.3/net-sysfs-fix-reference-count-leak-in-rx-netdev_queue_add_kobject.patch +++ /dev/null @@ -1,106 +0,0 @@ -From b8eb718348b8fb30b5a7d0a8fce26fb3f4ac741b Mon Sep 17 00:00:00 2001 -From: Jouni Hogander -Date: Wed, 20 Nov 2019 09:08:16 +0200 -Subject: net-sysfs: Fix reference count leak in rx|netdev_queue_add_kobject - -From: Jouni Hogander - -commit b8eb718348b8fb30b5a7d0a8fce26fb3f4ac741b upstream. - -kobject_init_and_add takes reference even when it fails. This has -to be given up by the caller in error handling. Otherwise memory -allocated by kobject_init_and_add is never freed. Originally found -by Syzkaller: - -BUG: memory leak -unreferenced object 0xffff8880679f8b08 (size 8): - comm "netdev_register", pid 269, jiffies 4294693094 (age 12.132s) - hex dump (first 8 bytes): - 72 78 2d 30 00 36 20 d4 rx-0.6 . - backtrace: - [<000000008c93818e>] __kmalloc_track_caller+0x16e/0x290 - [<000000001f2e4e49>] kvasprintf+0xb1/0x140 - [<000000007f313394>] kvasprintf_const+0x56/0x160 - [<00000000aeca11c8>] kobject_set_name_vargs+0x5b/0x140 - [<0000000073a0367c>] kobject_init_and_add+0xd8/0x170 - [<0000000088838e4b>] net_rx_queue_update_kobjects+0x152/0x560 - [<000000006be5f104>] netdev_register_kobject+0x210/0x380 - [<00000000e31dab9d>] register_netdevice+0xa1b/0xf00 - [<00000000f68b2465>] __tun_chr_ioctl+0x20d5/0x3dd0 - [<000000004c50599f>] tun_chr_ioctl+0x2f/0x40 - [<00000000bbd4c317>] do_vfs_ioctl+0x1c7/0x1510 - [<00000000d4c59e8f>] ksys_ioctl+0x99/0xb0 - [<00000000946aea81>] __x64_sys_ioctl+0x78/0xb0 - [<0000000038d946e5>] do_syscall_64+0x16f/0x580 - [<00000000e0aa5d8f>] entry_SYSCALL_64_after_hwframe+0x44/0xa9 - [<00000000285b3d1a>] 0xffffffffffffffff - -Cc: David Miller -Cc: Lukas Bulwahn -Signed-off-by: Jouni Hogander -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman - ---- - net/core/net-sysfs.c | 24 +++++++++++++----------- - 1 file changed, 13 insertions(+), 11 deletions(-) - ---- a/net/core/net-sysfs.c -+++ b/net/core/net-sysfs.c -@@ -923,21 +923,23 @@ static int rx_queue_add_kobject(struct n - error = kobject_init_and_add(kobj, &rx_queue_ktype, NULL, - "rx-%u", index); - if (error) -- return error; -+ goto err; - - dev_hold(queue->dev); - - if (dev->sysfs_rx_queue_group) { - error = sysfs_create_group(kobj, dev->sysfs_rx_queue_group); -- if (error) { -- kobject_put(kobj); -- return error; -- } -+ if (error) -+ goto err; - } - - kobject_uevent(kobj, KOBJ_ADD); - - return error; -+ -+err: -+ kobject_put(kobj); -+ return error; - } - #endif /* CONFIG_SYSFS */ - -@@ -1461,21 +1463,21 @@ static int netdev_queue_add_kobject(stru - error = kobject_init_and_add(kobj, &netdev_queue_ktype, NULL, - "tx-%u", index); - if (error) -- return error; -+ goto err; - - dev_hold(queue->dev); - - #ifdef CONFIG_BQL - error = sysfs_create_group(kobj, &dql_group); -- if (error) { -- kobject_put(kobj); -- return error; -- } -+ if (error) -+ goto err; - #endif - - kobject_uevent(kobj, KOBJ_ADD); - -- return 0; -+err: -+ kobject_put(kobj); -+ return error; - } - #endif /* CONFIG_SYSFS */ - diff --git a/queue-5.3/series b/queue-5.3/series index cd31be58467..30a497820dc 100644 --- a/queue-5.3/series +++ b/queue-5.3/series @@ -66,7 +66,6 @@ x86-entry-32-fix-fixup_espfix_stack-with-user-cr3.patch futex-prevent-robust-futex-exit-race.patch alsa-usb-audio-fix-null-dereference-at-parsing-badd.patch nfc-port100-handle-command-failure-cleanly.patch -net-sysfs-fix-reference-count-leak-in-rx-netdev_queue_add_kobject.patch media-vivid-set-vid_cap_streaming-and-vid_out_streaming-to-true.patch media-vivid-fix-wrong-locking-that-causes-race-conditions-on-streaming-stop.patch media-usbvision-fix-invalid-accesses-after-device-disconnect.patch @@ -93,4 +92,3 @@ staging-comedi-usbduxfast-usbduxfast_ai_cmdtest-rounding-error.patch powerpc-64s-support-nospectre_v2-cmdline-option.patch powerpc-book3s64-fix-link-stack-flush-on-context-switch.patch kvm-ppc-book3s-hv-flush-link-stack-on-guest-exit-to.patch -net-sysfs-fix-netdev_queue_add_kobject-breakage.patch