From: Greg Kroah-Hartman Date: Tue, 26 Oct 2021 13:46:46 +0000 (+0200) Subject: drop usbnet-sanity-check-for-maxpacket.patch from everywhere X-Git-Tag: v4.4.290~1 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64c647bb4fd941cc7d13bddccd3fc9bedf896eda;p=thirdparty%2Fkernel%2Fstable-queue.git drop usbnet-sanity-check-for-maxpacket.patch from everywhere --- diff --git a/queue-4.14/series b/queue-4.14/series index a4ff480bbe9..94717cb3555 100644 --- a/queue-4.14/series +++ b/queue-4.14/series @@ -24,7 +24,6 @@ isdn-misdn-fix-sleeping-function-called-from-invalid.patch platform-x86-intel_scu_ipc-update-timeout-value-in-c.patch alsa-hda-avoid-write-to-statests-if-controller-is-in.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 tracing-have-all-levels-of-checks-prevent-recursion.patch arm-9122-1-select-have_futex_cmpxchg.patch diff --git a/queue-4.14/usbnet-sanity-check-for-maxpacket.patch b/queue-4.14/usbnet-sanity-check-for-maxpacket.patch deleted file mode 100644 index 4a4f6a4bdc9..00000000000 --- a/queue-4.14/usbnet-sanity-check-for-maxpacket.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 -@@ -1788,6 +1788,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)) diff --git a/queue-4.19/series b/queue-4.19/series index b40fd448e90..619999c7ae7 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -31,7 +31,6 @@ isdn-misdn-fix-sleeping-function-called-from-invalid.patch platform-x86-intel_scu_ipc-update-timeout-value-in-c.patch alsa-hda-avoid-write-to-statests-if-controller-is-in.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 tracing-have-all-levels-of-checks-prevent-recursion.patch arm-9122-1-select-have_futex_cmpxchg.patch diff --git a/queue-4.19/usbnet-sanity-check-for-maxpacket.patch b/queue-4.19/usbnet-sanity-check-for-maxpacket.patch deleted file mode 100644 index 9383f52aa17..00000000000 --- a/queue-4.19/usbnet-sanity-check-for-maxpacket.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 -@@ -1784,6 +1784,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)) diff --git a/queue-4.4/series b/queue-4.4/series index 382aa82095f..d63a235787c 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -38,7 +38,6 @@ arm-dts-spear3xx-fix-gmac-node.patch isdn-misdn-fix-sleeping-function-called-from-invalid.patch platform-x86-intel_scu_ipc-update-timeout-value-in-c.patch alsa-hda-avoid-write-to-statests-if-controller-is-in.patch -usbnet-sanity-check-for-maxpacket.patch net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch tracing-have-all-levels-of-checks-prevent-recursion.patch arm-9122-1-select-have_futex_cmpxchg.patch diff --git a/queue-4.4/usbnet-sanity-check-for-maxpacket.patch b/queue-4.4/usbnet-sanity-check-for-maxpacket.patch deleted file mode 100644 index 4abe0d46174..00000000000 --- a/queue-4.4/usbnet-sanity-check-for-maxpacket.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 -@@ -1730,6 +1730,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)) diff --git a/queue-4.9/series b/queue-4.9/series index bb7edd79a25..f7d06151661 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -44,7 +44,6 @@ arm-dts-spear3xx-fix-gmac-node.patch isdn-misdn-fix-sleeping-function-called-from-invalid.patch platform-x86-intel_scu_ipc-update-timeout-value-in-c.patch alsa-hda-avoid-write-to-statests-if-controller-is-in.patch -usbnet-sanity-check-for-maxpacket.patch net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch tracing-have-all-levels-of-checks-prevent-recursion.patch arm-9122-1-select-have_futex_cmpxchg.patch diff --git a/queue-4.9/usbnet-sanity-check-for-maxpacket.patch b/queue-4.9/usbnet-sanity-check-for-maxpacket.patch deleted file mode 100644 index a688df09cdd..00000000000 --- a/queue-4.9/usbnet-sanity-check-for-maxpacket.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 -@@ -1740,6 +1740,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)) diff --git a/queue-5.10/series b/queue-5.10/series index e24551eee56..ca9caf813d5 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -86,7 +86,6 @@ scsi-core-fix-shost-cmd_per_lun-calculation-in-scsi_add_host_with_dma.patch can-isotp-isotp_sendmsg-fix-tx-buffer-concurrent-access-in-isotp_sendmsg.patch s390-pci-fix-zpci_zdev_put-on-reserve.patch bpf-test-cgroup-use-sk_-alloc-free-for-test-cases.patch -usbnet-sanity-check-for-maxpacket.patch net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch tracing-have-all-levels-of-checks-prevent-recursion.patch e1000e-separate-tgp-board-type-from-spt.patch diff --git a/queue-5.10/usbnet-sanity-check-for-maxpacket.patch b/queue-5.10/usbnet-sanity-check-for-maxpacket.patch deleted file mode 100644 index 8e841b2db85..00000000000 --- a/queue-5.10/usbnet-sanity-check-for-maxpacket.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 -@@ -1755,6 +1755,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)) diff --git a/queue-5.14/series b/queue-5.14/series index 280528bc487..e27cbcae607 100644 --- a/queue-5.14/series +++ b/queue-5.14/series @@ -162,7 +162,6 @@ scsi-core-fix-shost-cmd_per_lun-calculation-in-scsi_add_host_with_dma.patch s390-pci-cleanup-resources-only-if-necessary.patch s390-pci-fix-zpci_zdev_put-on-reserve.patch bpf-test-cgroup-use-sk_-alloc-free-for-test-cases.patch -usbnet-sanity-check-for-maxpacket.patch net-mdiobus-fix-memory-leak-in-__mdiobus_register.patch e1000e-separate-tgp-board-type-from-spt.patch arm-9122-1-select-have_futex_cmpxchg.patch diff --git a/queue-5.14/usbnet-sanity-check-for-maxpacket.patch b/queue-5.14/usbnet-sanity-check-for-maxpacket.patch deleted file mode 100644 index 4a4f6a4bdc9..00000000000 --- a/queue-5.14/usbnet-sanity-check-for-maxpacket.patch +++ /dev/null @@ -1,37 +0,0 @@ -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 -@@ -1788,6 +1788,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)) diff --git a/queue-5.4/series b/queue-5.4/series index 85a6464d611..9096455fea8 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -51,7 +51,6 @@ 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 tracing-have-all-levels-of-checks-prevent-recursion.patch arm-9122-1-select-have_futex_cmpxchg.patch diff --git a/queue-5.4/usbnet-sanity-check-for-maxpacket.patch b/queue-5.4/usbnet-sanity-check-for-maxpacket.patch deleted file mode 100644 index 4f3968aadae..00000000000 --- a/queue-5.4/usbnet-sanity-check-for-maxpacket.patch +++ /dev/null @@ -1,37 +0,0 @@ -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))