From: Greg Kroah-Hartman Date: Mon, 25 Oct 2021 14:08:44 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v4.4.290~23 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=30c37eefdd2a052b6a91fc8930185a428354ef48;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch usbnet-sanity-check-for-maxpacket.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 new file mode 100644 index 00000000000..2b00bfc2bd8 --- /dev/null +++ b/queue-5.4/net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch @@ -0,0 +1,89 @@ +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 +@@ -395,6 +395,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 2a85a2f65db..5dd9c9a2b4f 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -51,3 +51,5 @@ platform-x86-intel_scu_ipc-update-timeout-value-in-c.patch alsa-hda-avoid-write-to-statests-if-controller-is-in.patch input-snvs_pwrkey-add-clk-handling.patch scsi-core-fix-shost-cmd_per_lun-calculation-in-scsi_add_host_with_dma.patch +usbnet-sanity-check-for-maxpacket.patch +net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch diff --git a/queue-5.4/usbnet-sanity-check-for-maxpacket.patch b/queue-5.4/usbnet-sanity-check-for-maxpacket.patch new file mode 100644 index 00000000000..4f3968aadae --- /dev/null +++ b/queue-5.4/usbnet-sanity-check-for-maxpacket.patch @@ -0,0 +1,37 @@ +From 397430b50a363d8b7bdda00522123f82df6adc5e Mon Sep 17 00:00:00 2001 +From: Oliver Neukum +Date: Thu, 21 Oct 2021 14:29:44 +0200 +Subject: usbnet: sanity check for maxpacket + +From: Oliver Neukum + +commit 397430b50a363d8b7bdda00522123f82df6adc5e upstream. + +maxpacket of 0 makes no sense and oopses as we need to divide +by it. Give up. + +V2: fixed typo in log and stylistic issues + +Signed-off-by: Oliver Neukum +Reported-by: syzbot+76bb1d34ffa0adc03baa@syzkaller.appspotmail.com +Reviewed-by: Johan Hovold +Link: https://lore.kernel.org/r/20211021122944.21816-1-oneukum@suse.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/usb/usbnet.c | 4 ++++ + 1 file changed, 4 insertions(+) + +--- a/drivers/net/usb/usbnet.c ++++ b/drivers/net/usb/usbnet.c +@@ -1773,6 +1773,10 @@ usbnet_probe (struct usb_interface *udev + if (!dev->rx_urb_size) + dev->rx_urb_size = dev->hard_mtu; + dev->maxpacket = usb_maxpacket (dev->udev, dev->out, 1); ++ if (dev->maxpacket == 0) { ++ /* that is a broken device */ ++ goto out4; ++ } + + /* let userspace know we have a random address */ + if (ether_addr_equal(net->dev_addr, node_id))