From: Greg Kroah-Hartman Date: Tue, 5 Oct 2021 06:55:14 +0000 (+0200) Subject: drop net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch from everywhere X-Git-Tag: v4.4.286~5 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b37e2e71512763404210f6e57bc04613d59b23a2;p=thirdparty%2Fkernel%2Fstable-queue.git drop net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch from everywhere --- diff --git a/queue-4.14/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch b/queue-4.14/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch deleted file mode 100644 index dc0ac7ca27c..00000000000 --- a/queue-4.14/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch +++ /dev/null @@ -1,89 +0,0 @@ -From ab609f25d19858513919369ff3d9a63c02cd9e2e Mon Sep 17 00:00:00 2001 -From: Yanfei Xu -Date: Sun, 26 Sep 2021 12:53:13 +0800 -Subject: net: mdiobus: Fix memory leak in __mdiobus_register - -From: Yanfei Xu - -commit ab609f25d19858513919369ff3d9a63c02cd9e2e upstream. - -Once device_register() failed, we should call put_device() to -decrement reference count for cleanup. Or it will cause memory -leak. - -BUG: memory leak -unreferenced object 0xffff888114032e00 (size 256): - comm "kworker/1:3", pid 2960, jiffies 4294943572 (age 15.920s) - hex dump (first 32 bytes): - 00 00 00 00 00 00 00 00 08 2e 03 14 81 88 ff ff ................ - 08 2e 03 14 81 88 ff ff 90 76 65 82 ff ff ff ff .........ve..... - backtrace: - [] kmalloc include/linux/slab.h:591 [inline] - [] kzalloc include/linux/slab.h:721 [inline] - [] device_private_init drivers/base/core.c:3203 [inline] - [] device_add+0x89b/0xdf0 drivers/base/core.c:3253 - [] __mdiobus_register+0xc3/0x450 drivers/net/phy/mdio_bus.c:537 - [] __devm_mdiobus_register+0x75/0xf0 drivers/net/phy/mdio_devres.c:87 - [] ax88772_init_mdio drivers/net/usb/asix_devices.c:676 [inline] - [] ax88772_bind+0x330/0x480 drivers/net/usb/asix_devices.c:786 - [] usbnet_probe+0x3ff/0xdf0 drivers/net/usb/usbnet.c:1745 - [] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396 - [] call_driver_probe drivers/base/dd.c:517 [inline] - [] really_probe.part.0+0xe7/0x380 drivers/base/dd.c:596 - [] really_probe drivers/base/dd.c:558 [inline] - [] __driver_probe_device+0x10c/0x1e0 drivers/base/dd.c:751 - [] driver_probe_device+0x2a/0x120 drivers/base/dd.c:781 - [] __device_attach_driver+0xf6/0x140 drivers/base/dd.c:898 - [] bus_for_each_drv+0xb7/0x100 drivers/base/bus.c:427 - [] __device_attach+0x122/0x260 drivers/base/dd.c:969 - [] bus_probe_device+0xc6/0xe0 drivers/base/bus.c:487 - [] device_add+0x5fb/0xdf0 drivers/base/core.c:3359 - [] usb_set_configuration+0x9d9/0xb90 drivers/usb/core/message.c:2170 - [] usb_generic_driver_probe+0x8c/0xc0 drivers/usb/core/generic.c:238 - -BUG: memory leak -unreferenced object 0xffff888116f06900 (size 32): - comm "kworker/0:2", pid 2670, jiffies 4294944448 (age 7.160s) - hex dump (first 32 bytes): - 75 73 62 2d 30 30 31 3a 30 30 33 00 00 00 00 00 usb-001:003..... - 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ - backtrace: - [] kstrdup+0x36/0x70 mm/util.c:60 - [] kstrdup_const+0x53/0x80 mm/util.c:83 - [] kvasprintf_const+0xc2/0x110 lib/kasprintf.c:48 - [] kobject_set_name_vargs+0x3b/0xe0 lib/kobject.c:289 - [] dev_set_name+0x63/0x90 drivers/base/core.c:3147 - [] __mdiobus_register+0xbb/0x450 drivers/net/phy/mdio_bus.c:535 - [] __devm_mdiobus_register+0x75/0xf0 drivers/net/phy/mdio_devres.c:87 - [] ax88772_init_mdio drivers/net/usb/asix_devices.c:676 [inline] - [] ax88772_bind+0x330/0x480 drivers/net/usb/asix_devices.c:786 - [] usbnet_probe+0x3ff/0xdf0 drivers/net/usb/usbnet.c:1745 - [] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396 - [] call_driver_probe drivers/base/dd.c:517 [inline] - [] really_probe.part.0+0xe7/0x380 drivers/base/dd.c:596 - [] really_probe drivers/base/dd.c:558 [inline] - [] __driver_probe_device+0x10c/0x1e0 drivers/base/dd.c:751 - [] driver_probe_device+0x2a/0x120 drivers/base/dd.c:781 - [] __device_attach_driver+0xf6/0x140 drivers/base/dd.c:898 - [] bus_for_each_drv+0xb7/0x100 drivers/base/bus.c:427 - [] __device_attach+0x122/0x260 drivers/base/dd.c:969 - -Reported-by: syzbot+398e7dc692ddbbb4cfec@syzkaller.appspotmail.com -Signed-off-by: Yanfei Xu -Reviewed-by: Andrew Lunn -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/phy/mdio_bus.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/net/phy/mdio_bus.c -+++ b/drivers/net/phy/mdio_bus.c -@@ -347,6 +347,7 @@ int __mdiobus_register(struct mii_bus *b - err = device_register(&bus->dev); - if (err) { - pr_err("mii_bus %s failed to register\n", bus->id); -+ put_device(&bus->dev); - return -EINVAL; - } - diff --git a/queue-4.14/series b/queue-4.14/series index 816efbe1f04..679addd5b4a 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -72,5 +72,4 @@ crypto-ccp-fix-resource-leaks-in-ccp_run_aes_gcm_cmd.patch hid-betop-fix-slab-out-of-bounds-write-in-betop_probe.patch netfilter-ipset-fix-oversized-kvmalloc-calls.patch hid-usbhid-free-raw_report-buffers-in-usbhid_stop.patch -net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch cred-allow-get_cred-and-put_cred-to-be-given-null.patch diff --git a/queue-4.19/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch b/queue-4.19/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch deleted file mode 100644 index 4cb45c78af7..00000000000 --- a/queue-4.19/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch +++ /dev/null @@ -1,89 +0,0 @@ -From ab609f25d19858513919369ff3d9a63c02cd9e2e Mon Sep 17 00:00:00 2001 -From: Yanfei Xu -Date: Sun, 26 Sep 2021 12:53:13 +0800 -Subject: net: mdiobus: Fix memory leak in __mdiobus_register - -From: Yanfei Xu - -commit ab609f25d19858513919369ff3d9a63c02cd9e2e upstream. - -Once device_register() failed, we should call put_device() to -decrement reference count for cleanup. Or it will cause memory -leak. - -BUG: memory leak -unreferenced object 0xffff888114032e00 (size 256): - comm "kworker/1:3", pid 2960, jiffies 4294943572 (age 15.920s) - hex dump (first 32 bytes): - 00 00 00 00 00 00 00 00 08 2e 03 14 81 88 ff ff ................ - 08 2e 03 14 81 88 ff ff 90 76 65 82 ff ff ff ff .........ve..... - backtrace: - [] kmalloc include/linux/slab.h:591 [inline] - [] kzalloc include/linux/slab.h:721 [inline] - [] device_private_init drivers/base/core.c:3203 [inline] - [] device_add+0x89b/0xdf0 drivers/base/core.c:3253 - [] __mdiobus_register+0xc3/0x450 drivers/net/phy/mdio_bus.c:537 - [] __devm_mdiobus_register+0x75/0xf0 drivers/net/phy/mdio_devres.c:87 - [] ax88772_init_mdio drivers/net/usb/asix_devices.c:676 [inline] - [] ax88772_bind+0x330/0x480 drivers/net/usb/asix_devices.c:786 - [] usbnet_probe+0x3ff/0xdf0 drivers/net/usb/usbnet.c:1745 - [] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396 - [] call_driver_probe drivers/base/dd.c:517 [inline] - [] really_probe.part.0+0xe7/0x380 drivers/base/dd.c:596 - [] really_probe drivers/base/dd.c:558 [inline] - [] __driver_probe_device+0x10c/0x1e0 drivers/base/dd.c:751 - [] driver_probe_device+0x2a/0x120 drivers/base/dd.c:781 - [] __device_attach_driver+0xf6/0x140 drivers/base/dd.c:898 - [] bus_for_each_drv+0xb7/0x100 drivers/base/bus.c:427 - [] __device_attach+0x122/0x260 drivers/base/dd.c:969 - [] bus_probe_device+0xc6/0xe0 drivers/base/bus.c:487 - [] device_add+0x5fb/0xdf0 drivers/base/core.c:3359 - [] usb_set_configuration+0x9d9/0xb90 drivers/usb/core/message.c:2170 - [] usb_generic_driver_probe+0x8c/0xc0 drivers/usb/core/generic.c:238 - -BUG: memory leak -unreferenced object 0xffff888116f06900 (size 32): - comm "kworker/0:2", pid 2670, jiffies 4294944448 (age 7.160s) - hex dump (first 32 bytes): - 75 73 62 2d 30 30 31 3a 30 30 33 00 00 00 00 00 usb-001:003..... - 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ - backtrace: - [] kstrdup+0x36/0x70 mm/util.c:60 - [] kstrdup_const+0x53/0x80 mm/util.c:83 - [] kvasprintf_const+0xc2/0x110 lib/kasprintf.c:48 - [] kobject_set_name_vargs+0x3b/0xe0 lib/kobject.c:289 - [] dev_set_name+0x63/0x90 drivers/base/core.c:3147 - [] __mdiobus_register+0xbb/0x450 drivers/net/phy/mdio_bus.c:535 - [] __devm_mdiobus_register+0x75/0xf0 drivers/net/phy/mdio_devres.c:87 - [] ax88772_init_mdio drivers/net/usb/asix_devices.c:676 [inline] - [] ax88772_bind+0x330/0x480 drivers/net/usb/asix_devices.c:786 - [] usbnet_probe+0x3ff/0xdf0 drivers/net/usb/usbnet.c:1745 - [] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396 - [] call_driver_probe drivers/base/dd.c:517 [inline] - [] really_probe.part.0+0xe7/0x380 drivers/base/dd.c:596 - [] really_probe drivers/base/dd.c:558 [inline] - [] __driver_probe_device+0x10c/0x1e0 drivers/base/dd.c:751 - [] driver_probe_device+0x2a/0x120 drivers/base/dd.c:781 - [] __device_attach_driver+0xf6/0x140 drivers/base/dd.c:898 - [] bus_for_each_drv+0xb7/0x100 drivers/base/bus.c:427 - [] __device_attach+0x122/0x260 drivers/base/dd.c:969 - -Reported-by: syzbot+398e7dc692ddbbb4cfec@syzkaller.appspotmail.com -Signed-off-by: Yanfei Xu -Reviewed-by: Andrew Lunn -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/phy/mdio_bus.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/net/phy/mdio_bus.c -+++ b/drivers/net/phy/mdio_bus.c -@@ -381,6 +381,7 @@ int __mdiobus_register(struct mii_bus *b - err = device_register(&bus->dev); - if (err) { - pr_err("mii_bus %s failed to register\n", bus->id); -+ put_device(&bus->dev); - return -EINVAL; - } - diff --git a/queue-4.19/series b/queue-4.19/series index 29f0c870df9..b6f8dc8d7f0 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -92,5 +92,4 @@ crypto-ccp-fix-resource-leaks-in-ccp_run_aes_gcm_cmd.patch hid-betop-fix-slab-out-of-bounds-write-in-betop_probe.patch netfilter-ipset-fix-oversized-kvmalloc-calls.patch hid-usbhid-free-raw_report-buffers-in-usbhid_stop.patch -net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch cred-allow-get_cred-and-put_cred-to-be-given-null.patch diff --git a/queue-4.4/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch b/queue-4.4/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch deleted file mode 100644 index f985209266a..00000000000 --- a/queue-4.4/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch +++ /dev/null @@ -1,89 +0,0 @@ -From ab609f25d19858513919369ff3d9a63c02cd9e2e Mon Sep 17 00:00:00 2001 -From: Yanfei Xu -Date: Sun, 26 Sep 2021 12:53:13 +0800 -Subject: net: mdiobus: Fix memory leak in __mdiobus_register - -From: Yanfei Xu - -commit ab609f25d19858513919369ff3d9a63c02cd9e2e upstream. - -Once device_register() failed, we should call put_device() to -decrement reference count for cleanup. Or it will cause memory -leak. - -BUG: memory leak -unreferenced object 0xffff888114032e00 (size 256): - comm "kworker/1:3", pid 2960, jiffies 4294943572 (age 15.920s) - hex dump (first 32 bytes): - 00 00 00 00 00 00 00 00 08 2e 03 14 81 88 ff ff ................ - 08 2e 03 14 81 88 ff ff 90 76 65 82 ff ff ff ff .........ve..... - backtrace: - [] kmalloc include/linux/slab.h:591 [inline] - [] kzalloc include/linux/slab.h:721 [inline] - [] device_private_init drivers/base/core.c:3203 [inline] - [] device_add+0x89b/0xdf0 drivers/base/core.c:3253 - [] __mdiobus_register+0xc3/0x450 drivers/net/phy/mdio_bus.c:537 - [] __devm_mdiobus_register+0x75/0xf0 drivers/net/phy/mdio_devres.c:87 - [] ax88772_init_mdio drivers/net/usb/asix_devices.c:676 [inline] - [] ax88772_bind+0x330/0x480 drivers/net/usb/asix_devices.c:786 - [] usbnet_probe+0x3ff/0xdf0 drivers/net/usb/usbnet.c:1745 - [] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396 - [] call_driver_probe drivers/base/dd.c:517 [inline] - [] really_probe.part.0+0xe7/0x380 drivers/base/dd.c:596 - [] really_probe drivers/base/dd.c:558 [inline] - [] __driver_probe_device+0x10c/0x1e0 drivers/base/dd.c:751 - [] driver_probe_device+0x2a/0x120 drivers/base/dd.c:781 - [] __device_attach_driver+0xf6/0x140 drivers/base/dd.c:898 - [] bus_for_each_drv+0xb7/0x100 drivers/base/bus.c:427 - [] __device_attach+0x122/0x260 drivers/base/dd.c:969 - [] bus_probe_device+0xc6/0xe0 drivers/base/bus.c:487 - [] device_add+0x5fb/0xdf0 drivers/base/core.c:3359 - [] usb_set_configuration+0x9d9/0xb90 drivers/usb/core/message.c:2170 - [] usb_generic_driver_probe+0x8c/0xc0 drivers/usb/core/generic.c:238 - -BUG: memory leak -unreferenced object 0xffff888116f06900 (size 32): - comm "kworker/0:2", pid 2670, jiffies 4294944448 (age 7.160s) - hex dump (first 32 bytes): - 75 73 62 2d 30 30 31 3a 30 30 33 00 00 00 00 00 usb-001:003..... - 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ - backtrace: - [] kstrdup+0x36/0x70 mm/util.c:60 - [] kstrdup_const+0x53/0x80 mm/util.c:83 - [] kvasprintf_const+0xc2/0x110 lib/kasprintf.c:48 - [] kobject_set_name_vargs+0x3b/0xe0 lib/kobject.c:289 - [] dev_set_name+0x63/0x90 drivers/base/core.c:3147 - [] __mdiobus_register+0xbb/0x450 drivers/net/phy/mdio_bus.c:535 - [] __devm_mdiobus_register+0x75/0xf0 drivers/net/phy/mdio_devres.c:87 - [] ax88772_init_mdio drivers/net/usb/asix_devices.c:676 [inline] - [] ax88772_bind+0x330/0x480 drivers/net/usb/asix_devices.c:786 - [] usbnet_probe+0x3ff/0xdf0 drivers/net/usb/usbnet.c:1745 - [] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396 - [] call_driver_probe drivers/base/dd.c:517 [inline] - [] really_probe.part.0+0xe7/0x380 drivers/base/dd.c:596 - [] really_probe drivers/base/dd.c:558 [inline] - [] __driver_probe_device+0x10c/0x1e0 drivers/base/dd.c:751 - [] driver_probe_device+0x2a/0x120 drivers/base/dd.c:781 - [] __device_attach_driver+0xf6/0x140 drivers/base/dd.c:898 - [] bus_for_each_drv+0xb7/0x100 drivers/base/bus.c:427 - [] __device_attach+0x122/0x260 drivers/base/dd.c:969 - -Reported-by: syzbot+398e7dc692ddbbb4cfec@syzkaller.appspotmail.com -Signed-off-by: Yanfei Xu -Reviewed-by: Andrew Lunn -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/phy/mdio_bus.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/net/phy/mdio_bus.c -+++ b/drivers/net/phy/mdio_bus.c -@@ -267,6 +267,7 @@ int __mdiobus_register(struct mii_bus *b - err = device_register(&bus->dev); - if (err) { - pr_err("mii_bus %s failed to register\n", bus->id); -+ put_device(&bus->dev); - return -EINVAL; - } - diff --git a/queue-4.4/series b/queue-4.4/series index fb3103e228b..0bc42bd0e35 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -38,5 +38,4 @@ arm64-extend-workaround-for-erratum-1024718-to-all-versions-of-cortex-a55.patch hid-betop-fix-slab-out-of-bounds-write-in-betop_probe.patch netfilter-ipset-fix-oversized-kvmalloc-calls.patch hid-usbhid-free-raw_report-buffers-in-usbhid_stop.patch -net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch cred-allow-get_cred-and-put_cred-to-be-given-null.patch diff --git a/queue-4.9/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch b/queue-4.9/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch deleted file mode 100644 index 4dfa9f87ab6..00000000000 --- a/queue-4.9/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch +++ /dev/null @@ -1,89 +0,0 @@ -From ab609f25d19858513919369ff3d9a63c02cd9e2e Mon Sep 17 00:00:00 2001 -From: Yanfei Xu -Date: Sun, 26 Sep 2021 12:53:13 +0800 -Subject: net: mdiobus: Fix memory leak in __mdiobus_register - -From: Yanfei Xu - -commit ab609f25d19858513919369ff3d9a63c02cd9e2e upstream. - -Once device_register() failed, we should call put_device() to -decrement reference count for cleanup. Or it will cause memory -leak. - -BUG: memory leak -unreferenced object 0xffff888114032e00 (size 256): - comm "kworker/1:3", pid 2960, jiffies 4294943572 (age 15.920s) - hex dump (first 32 bytes): - 00 00 00 00 00 00 00 00 08 2e 03 14 81 88 ff ff ................ - 08 2e 03 14 81 88 ff ff 90 76 65 82 ff ff ff ff .........ve..... - backtrace: - [] kmalloc include/linux/slab.h:591 [inline] - [] kzalloc include/linux/slab.h:721 [inline] - [] device_private_init drivers/base/core.c:3203 [inline] - [] device_add+0x89b/0xdf0 drivers/base/core.c:3253 - [] __mdiobus_register+0xc3/0x450 drivers/net/phy/mdio_bus.c:537 - [] __devm_mdiobus_register+0x75/0xf0 drivers/net/phy/mdio_devres.c:87 - [] ax88772_init_mdio drivers/net/usb/asix_devices.c:676 [inline] - [] ax88772_bind+0x330/0x480 drivers/net/usb/asix_devices.c:786 - [] usbnet_probe+0x3ff/0xdf0 drivers/net/usb/usbnet.c:1745 - [] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396 - [] call_driver_probe drivers/base/dd.c:517 [inline] - [] really_probe.part.0+0xe7/0x380 drivers/base/dd.c:596 - [] really_probe drivers/base/dd.c:558 [inline] - [] __driver_probe_device+0x10c/0x1e0 drivers/base/dd.c:751 - [] driver_probe_device+0x2a/0x120 drivers/base/dd.c:781 - [] __device_attach_driver+0xf6/0x140 drivers/base/dd.c:898 - [] bus_for_each_drv+0xb7/0x100 drivers/base/bus.c:427 - [] __device_attach+0x122/0x260 drivers/base/dd.c:969 - [] bus_probe_device+0xc6/0xe0 drivers/base/bus.c:487 - [] device_add+0x5fb/0xdf0 drivers/base/core.c:3359 - [] usb_set_configuration+0x9d9/0xb90 drivers/usb/core/message.c:2170 - [] usb_generic_driver_probe+0x8c/0xc0 drivers/usb/core/generic.c:238 - -BUG: memory leak -unreferenced object 0xffff888116f06900 (size 32): - comm "kworker/0:2", pid 2670, jiffies 4294944448 (age 7.160s) - hex dump (first 32 bytes): - 75 73 62 2d 30 30 31 3a 30 30 33 00 00 00 00 00 usb-001:003..... - 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ - backtrace: - [] kstrdup+0x36/0x70 mm/util.c:60 - [] kstrdup_const+0x53/0x80 mm/util.c:83 - [] kvasprintf_const+0xc2/0x110 lib/kasprintf.c:48 - [] kobject_set_name_vargs+0x3b/0xe0 lib/kobject.c:289 - [] dev_set_name+0x63/0x90 drivers/base/core.c:3147 - [] __mdiobus_register+0xbb/0x450 drivers/net/phy/mdio_bus.c:535 - [] __devm_mdiobus_register+0x75/0xf0 drivers/net/phy/mdio_devres.c:87 - [] ax88772_init_mdio drivers/net/usb/asix_devices.c:676 [inline] - [] ax88772_bind+0x330/0x480 drivers/net/usb/asix_devices.c:786 - [] usbnet_probe+0x3ff/0xdf0 drivers/net/usb/usbnet.c:1745 - [] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396 - [] call_driver_probe drivers/base/dd.c:517 [inline] - [] really_probe.part.0+0xe7/0x380 drivers/base/dd.c:596 - [] really_probe drivers/base/dd.c:558 [inline] - [] __driver_probe_device+0x10c/0x1e0 drivers/base/dd.c:751 - [] driver_probe_device+0x2a/0x120 drivers/base/dd.c:781 - [] __device_attach_driver+0xf6/0x140 drivers/base/dd.c:898 - [] bus_for_each_drv+0xb7/0x100 drivers/base/bus.c:427 - [] __device_attach+0x122/0x260 drivers/base/dd.c:969 - -Reported-by: syzbot+398e7dc692ddbbb4cfec@syzkaller.appspotmail.com -Signed-off-by: Yanfei Xu -Reviewed-by: Andrew Lunn -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/phy/mdio_bus.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/net/phy/mdio_bus.c -+++ b/drivers/net/phy/mdio_bus.c -@@ -319,6 +319,7 @@ int __mdiobus_register(struct mii_bus *b - err = device_register(&bus->dev); - if (err) { - pr_err("mii_bus %s failed to register\n", bus->id); -+ put_device(&bus->dev); - return -EINVAL; - } - diff --git a/queue-4.9/series b/queue-4.9/series index 4c5efd470ed..259db151171 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -54,5 +54,4 @@ arm64-extend-workaround-for-erratum-1024718-to-all-versions-of-cortex-a55.patch hid-betop-fix-slab-out-of-bounds-write-in-betop_probe.patch netfilter-ipset-fix-oversized-kvmalloc-calls.patch hid-usbhid-free-raw_report-buffers-in-usbhid_stop.patch -net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch cred-allow-get_cred-and-put_cred-to-be-given-null.patch diff --git a/queue-5.10/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch b/queue-5.10/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch deleted file mode 100644 index 98f59bc481a..00000000000 --- a/queue-5.10/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch +++ /dev/null @@ -1,89 +0,0 @@ -From ab609f25d19858513919369ff3d9a63c02cd9e2e Mon Sep 17 00:00:00 2001 -From: Yanfei Xu -Date: Sun, 26 Sep 2021 12:53:13 +0800 -Subject: net: mdiobus: Fix memory leak in __mdiobus_register - -From: Yanfei Xu - -commit ab609f25d19858513919369ff3d9a63c02cd9e2e upstream. - -Once device_register() failed, we should call put_device() to -decrement reference count for cleanup. Or it will cause memory -leak. - -BUG: memory leak -unreferenced object 0xffff888114032e00 (size 256): - comm "kworker/1:3", pid 2960, jiffies 4294943572 (age 15.920s) - hex dump (first 32 bytes): - 00 00 00 00 00 00 00 00 08 2e 03 14 81 88 ff ff ................ - 08 2e 03 14 81 88 ff ff 90 76 65 82 ff ff ff ff .........ve..... - backtrace: - [] kmalloc include/linux/slab.h:591 [inline] - [] kzalloc include/linux/slab.h:721 [inline] - [] device_private_init drivers/base/core.c:3203 [inline] - [] device_add+0x89b/0xdf0 drivers/base/core.c:3253 - [] __mdiobus_register+0xc3/0x450 drivers/net/phy/mdio_bus.c:537 - [] __devm_mdiobus_register+0x75/0xf0 drivers/net/phy/mdio_devres.c:87 - [] ax88772_init_mdio drivers/net/usb/asix_devices.c:676 [inline] - [] ax88772_bind+0x330/0x480 drivers/net/usb/asix_devices.c:786 - [] usbnet_probe+0x3ff/0xdf0 drivers/net/usb/usbnet.c:1745 - [] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396 - [] call_driver_probe drivers/base/dd.c:517 [inline] - [] really_probe.part.0+0xe7/0x380 drivers/base/dd.c:596 - [] really_probe drivers/base/dd.c:558 [inline] - [] __driver_probe_device+0x10c/0x1e0 drivers/base/dd.c:751 - [] driver_probe_device+0x2a/0x120 drivers/base/dd.c:781 - [] __device_attach_driver+0xf6/0x140 drivers/base/dd.c:898 - [] bus_for_each_drv+0xb7/0x100 drivers/base/bus.c:427 - [] __device_attach+0x122/0x260 drivers/base/dd.c:969 - [] bus_probe_device+0xc6/0xe0 drivers/base/bus.c:487 - [] device_add+0x5fb/0xdf0 drivers/base/core.c:3359 - [] usb_set_configuration+0x9d9/0xb90 drivers/usb/core/message.c:2170 - [] usb_generic_driver_probe+0x8c/0xc0 drivers/usb/core/generic.c:238 - -BUG: memory leak -unreferenced object 0xffff888116f06900 (size 32): - comm "kworker/0:2", pid 2670, jiffies 4294944448 (age 7.160s) - hex dump (first 32 bytes): - 75 73 62 2d 30 30 31 3a 30 30 33 00 00 00 00 00 usb-001:003..... - 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ - backtrace: - [] kstrdup+0x36/0x70 mm/util.c:60 - [] kstrdup_const+0x53/0x80 mm/util.c:83 - [] kvasprintf_const+0xc2/0x110 lib/kasprintf.c:48 - [] kobject_set_name_vargs+0x3b/0xe0 lib/kobject.c:289 - [] dev_set_name+0x63/0x90 drivers/base/core.c:3147 - [] __mdiobus_register+0xbb/0x450 drivers/net/phy/mdio_bus.c:535 - [] __devm_mdiobus_register+0x75/0xf0 drivers/net/phy/mdio_devres.c:87 - [] ax88772_init_mdio drivers/net/usb/asix_devices.c:676 [inline] - [] ax88772_bind+0x330/0x480 drivers/net/usb/asix_devices.c:786 - [] usbnet_probe+0x3ff/0xdf0 drivers/net/usb/usbnet.c:1745 - [] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396 - [] call_driver_probe drivers/base/dd.c:517 [inline] - [] really_probe.part.0+0xe7/0x380 drivers/base/dd.c:596 - [] really_probe drivers/base/dd.c:558 [inline] - [] __driver_probe_device+0x10c/0x1e0 drivers/base/dd.c:751 - [] driver_probe_device+0x2a/0x120 drivers/base/dd.c:781 - [] __device_attach_driver+0xf6/0x140 drivers/base/dd.c:898 - [] bus_for_each_drv+0xb7/0x100 drivers/base/bus.c:427 - [] __device_attach+0x122/0x260 drivers/base/dd.c:969 - -Reported-by: syzbot+398e7dc692ddbbb4cfec@syzkaller.appspotmail.com -Signed-off-by: Yanfei Xu -Reviewed-by: Andrew Lunn -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/phy/mdio_bus.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/net/phy/mdio_bus.c -+++ b/drivers/net/phy/mdio_bus.c -@@ -537,6 +537,7 @@ int __mdiobus_register(struct mii_bus *b - err = device_register(&bus->dev); - if (err) { - pr_err("mii_bus %s failed to register\n", bus->id); -+ put_device(&bus->dev); - return -EINVAL; - } - diff --git a/queue-5.10/series b/queue-5.10/series index ea8eabc7e16..70758e41a4d 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -87,7 +87,6 @@ hid-betop-fix-slab-out-of-bounds-write-in-betop_probe.patch netfilter-ipset-fix-oversized-kvmalloc-calls.patch mm-don-t-allow-oversized-kvmalloc-calls.patch hid-usbhid-free-raw_report-buffers-in-usbhid_stop.patch -net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch kvm-x86-handle-srcu-initialization-failure-during-page-track-init.patch netfilter-conntrack-serialize-hash-resizes-and-cleanups.patch netfilter-nf_tables-fix-oversized-kvmalloc-calls.patch diff --git a/queue-5.14/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch b/queue-5.14/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch deleted file mode 100644 index b0e31d52848..00000000000 --- a/queue-5.14/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch +++ /dev/null @@ -1,89 +0,0 @@ -From ab609f25d19858513919369ff3d9a63c02cd9e2e Mon Sep 17 00:00:00 2001 -From: Yanfei Xu -Date: Sun, 26 Sep 2021 12:53:13 +0800 -Subject: net: mdiobus: Fix memory leak in __mdiobus_register - -From: Yanfei Xu - -commit ab609f25d19858513919369ff3d9a63c02cd9e2e upstream. - -Once device_register() failed, we should call put_device() to -decrement reference count for cleanup. Or it will cause memory -leak. - -BUG: memory leak -unreferenced object 0xffff888114032e00 (size 256): - comm "kworker/1:3", pid 2960, jiffies 4294943572 (age 15.920s) - hex dump (first 32 bytes): - 00 00 00 00 00 00 00 00 08 2e 03 14 81 88 ff ff ................ - 08 2e 03 14 81 88 ff ff 90 76 65 82 ff ff ff ff .........ve..... - backtrace: - [] kmalloc include/linux/slab.h:591 [inline] - [] kzalloc include/linux/slab.h:721 [inline] - [] device_private_init drivers/base/core.c:3203 [inline] - [] device_add+0x89b/0xdf0 drivers/base/core.c:3253 - [] __mdiobus_register+0xc3/0x450 drivers/net/phy/mdio_bus.c:537 - [] __devm_mdiobus_register+0x75/0xf0 drivers/net/phy/mdio_devres.c:87 - [] ax88772_init_mdio drivers/net/usb/asix_devices.c:676 [inline] - [] ax88772_bind+0x330/0x480 drivers/net/usb/asix_devices.c:786 - [] usbnet_probe+0x3ff/0xdf0 drivers/net/usb/usbnet.c:1745 - [] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396 - [] call_driver_probe drivers/base/dd.c:517 [inline] - [] really_probe.part.0+0xe7/0x380 drivers/base/dd.c:596 - [] really_probe drivers/base/dd.c:558 [inline] - [] __driver_probe_device+0x10c/0x1e0 drivers/base/dd.c:751 - [] driver_probe_device+0x2a/0x120 drivers/base/dd.c:781 - [] __device_attach_driver+0xf6/0x140 drivers/base/dd.c:898 - [] bus_for_each_drv+0xb7/0x100 drivers/base/bus.c:427 - [] __device_attach+0x122/0x260 drivers/base/dd.c:969 - [] bus_probe_device+0xc6/0xe0 drivers/base/bus.c:487 - [] device_add+0x5fb/0xdf0 drivers/base/core.c:3359 - [] usb_set_configuration+0x9d9/0xb90 drivers/usb/core/message.c:2170 - [] usb_generic_driver_probe+0x8c/0xc0 drivers/usb/core/generic.c:238 - -BUG: memory leak -unreferenced object 0xffff888116f06900 (size 32): - comm "kworker/0:2", pid 2670, jiffies 4294944448 (age 7.160s) - hex dump (first 32 bytes): - 75 73 62 2d 30 30 31 3a 30 30 33 00 00 00 00 00 usb-001:003..... - 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ - backtrace: - [] kstrdup+0x36/0x70 mm/util.c:60 - [] kstrdup_const+0x53/0x80 mm/util.c:83 - [] kvasprintf_const+0xc2/0x110 lib/kasprintf.c:48 - [] kobject_set_name_vargs+0x3b/0xe0 lib/kobject.c:289 - [] dev_set_name+0x63/0x90 drivers/base/core.c:3147 - [] __mdiobus_register+0xbb/0x450 drivers/net/phy/mdio_bus.c:535 - [] __devm_mdiobus_register+0x75/0xf0 drivers/net/phy/mdio_devres.c:87 - [] ax88772_init_mdio drivers/net/usb/asix_devices.c:676 [inline] - [] ax88772_bind+0x330/0x480 drivers/net/usb/asix_devices.c:786 - [] usbnet_probe+0x3ff/0xdf0 drivers/net/usb/usbnet.c:1745 - [] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396 - [] call_driver_probe drivers/base/dd.c:517 [inline] - [] really_probe.part.0+0xe7/0x380 drivers/base/dd.c:596 - [] really_probe drivers/base/dd.c:558 [inline] - [] __driver_probe_device+0x10c/0x1e0 drivers/base/dd.c:751 - [] driver_probe_device+0x2a/0x120 drivers/base/dd.c:781 - [] __device_attach_driver+0xf6/0x140 drivers/base/dd.c:898 - [] bus_for_each_drv+0xb7/0x100 drivers/base/bus.c:427 - [] __device_attach+0x122/0x260 drivers/base/dd.c:969 - -Reported-by: syzbot+398e7dc692ddbbb4cfec@syzkaller.appspotmail.com -Signed-off-by: Yanfei Xu -Reviewed-by: Andrew Lunn -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/phy/mdio_bus.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/net/phy/mdio_bus.c -+++ b/drivers/net/phy/mdio_bus.c -@@ -541,6 +541,7 @@ int __mdiobus_register(struct mii_bus *b - err = device_register(&bus->dev); - if (err) { - pr_err("mii_bus %s failed to register\n", bus->id); -+ put_device(&bus->dev); - return -EINVAL; - } - diff --git a/queue-5.14/series b/queue-5.14/series index 89c03fa3f71..56aa7cc9064 100644 --- a/queue-5.14/series +++ b/queue-5.14/series @@ -165,7 +165,6 @@ netfilter-ipset-fix-oversized-kvmalloc-calls.patch mm-don-t-allow-oversized-kvmalloc-calls.patch hid-usbhid-free-raw_report-buffers-in-usbhid_stop.patch crypto-aesni-xts_crypt-return-if-walk.nbytes-is-0.patch -net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch kvm-x86-handle-srcu-initialization-failure-during-page-track-init.patch netfilter-conntrack-serialize-hash-resizes-and-cleanups.patch netfilter-nf_tables-fix-oversized-kvmalloc-calls.patch diff --git a/queue-5.4/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch b/queue-5.4/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch deleted file mode 100644 index 0f8091793b8..00000000000 --- a/queue-5.4/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch +++ /dev/null @@ -1,89 +0,0 @@ -From ab609f25d19858513919369ff3d9a63c02cd9e2e Mon Sep 17 00:00:00 2001 -From: Yanfei Xu -Date: Sun, 26 Sep 2021 12:53:13 +0800 -Subject: net: mdiobus: Fix memory leak in __mdiobus_register - -From: Yanfei Xu - -commit ab609f25d19858513919369ff3d9a63c02cd9e2e upstream. - -Once device_register() failed, we should call put_device() to -decrement reference count for cleanup. Or it will cause memory -leak. - -BUG: memory leak -unreferenced object 0xffff888114032e00 (size 256): - comm "kworker/1:3", pid 2960, jiffies 4294943572 (age 15.920s) - hex dump (first 32 bytes): - 00 00 00 00 00 00 00 00 08 2e 03 14 81 88 ff ff ................ - 08 2e 03 14 81 88 ff ff 90 76 65 82 ff ff ff ff .........ve..... - backtrace: - [] kmalloc include/linux/slab.h:591 [inline] - [] kzalloc include/linux/slab.h:721 [inline] - [] device_private_init drivers/base/core.c:3203 [inline] - [] device_add+0x89b/0xdf0 drivers/base/core.c:3253 - [] __mdiobus_register+0xc3/0x450 drivers/net/phy/mdio_bus.c:537 - [] __devm_mdiobus_register+0x75/0xf0 drivers/net/phy/mdio_devres.c:87 - [] ax88772_init_mdio drivers/net/usb/asix_devices.c:676 [inline] - [] ax88772_bind+0x330/0x480 drivers/net/usb/asix_devices.c:786 - [] usbnet_probe+0x3ff/0xdf0 drivers/net/usb/usbnet.c:1745 - [] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396 - [] call_driver_probe drivers/base/dd.c:517 [inline] - [] really_probe.part.0+0xe7/0x380 drivers/base/dd.c:596 - [] really_probe drivers/base/dd.c:558 [inline] - [] __driver_probe_device+0x10c/0x1e0 drivers/base/dd.c:751 - [] driver_probe_device+0x2a/0x120 drivers/base/dd.c:781 - [] __device_attach_driver+0xf6/0x140 drivers/base/dd.c:898 - [] bus_for_each_drv+0xb7/0x100 drivers/base/bus.c:427 - [] __device_attach+0x122/0x260 drivers/base/dd.c:969 - [] bus_probe_device+0xc6/0xe0 drivers/base/bus.c:487 - [] device_add+0x5fb/0xdf0 drivers/base/core.c:3359 - [] usb_set_configuration+0x9d9/0xb90 drivers/usb/core/message.c:2170 - [] usb_generic_driver_probe+0x8c/0xc0 drivers/usb/core/generic.c:238 - -BUG: memory leak -unreferenced object 0xffff888116f06900 (size 32): - comm "kworker/0:2", pid 2670, jiffies 4294944448 (age 7.160s) - hex dump (first 32 bytes): - 75 73 62 2d 30 30 31 3a 30 30 33 00 00 00 00 00 usb-001:003..... - 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ - backtrace: - [] kstrdup+0x36/0x70 mm/util.c:60 - [] kstrdup_const+0x53/0x80 mm/util.c:83 - [] kvasprintf_const+0xc2/0x110 lib/kasprintf.c:48 - [] kobject_set_name_vargs+0x3b/0xe0 lib/kobject.c:289 - [] dev_set_name+0x63/0x90 drivers/base/core.c:3147 - [] __mdiobus_register+0xbb/0x450 drivers/net/phy/mdio_bus.c:535 - [] __devm_mdiobus_register+0x75/0xf0 drivers/net/phy/mdio_devres.c:87 - [] ax88772_init_mdio drivers/net/usb/asix_devices.c:676 [inline] - [] ax88772_bind+0x330/0x480 drivers/net/usb/asix_devices.c:786 - [] usbnet_probe+0x3ff/0xdf0 drivers/net/usb/usbnet.c:1745 - [] usb_probe_interface+0x177/0x370 drivers/usb/core/driver.c:396 - [] call_driver_probe drivers/base/dd.c:517 [inline] - [] really_probe.part.0+0xe7/0x380 drivers/base/dd.c:596 - [] really_probe drivers/base/dd.c:558 [inline] - [] __driver_probe_device+0x10c/0x1e0 drivers/base/dd.c:751 - [] driver_probe_device+0x2a/0x120 drivers/base/dd.c:781 - [] __device_attach_driver+0xf6/0x140 drivers/base/dd.c:898 - [] bus_for_each_drv+0xb7/0x100 drivers/base/bus.c:427 - [] __device_attach+0x122/0x260 drivers/base/dd.c:969 - -Reported-by: syzbot+398e7dc692ddbbb4cfec@syzkaller.appspotmail.com -Signed-off-by: Yanfei Xu -Reviewed-by: Andrew Lunn -Signed-off-by: David S. Miller -Signed-off-by: Greg Kroah-Hartman ---- - drivers/net/phy/mdio_bus.c | 1 + - 1 file changed, 1 insertion(+) - ---- a/drivers/net/phy/mdio_bus.c -+++ b/drivers/net/phy/mdio_bus.c -@@ -388,6 +388,7 @@ int __mdiobus_register(struct mii_bus *b - err = device_register(&bus->dev); - if (err) { - pr_err("mii_bus %s failed to register\n", bus->id); -+ put_device(&bus->dev); - return -EINVAL; - } - diff --git a/queue-5.4/series b/queue-5.4/series index 3d290c5e880..8fe28b07275 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -53,4 +53,3 @@ crypto-ccp-fix-resource-leaks-in-ccp_run_aes_gcm_cmd.patch hid-betop-fix-slab-out-of-bounds-write-in-betop_probe.patch netfilter-ipset-fix-oversized-kvmalloc-calls.patch hid-usbhid-free-raw_report-buffers-in-usbhid_stop.patch -net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch