From 24ed8ecc3945745814fecd26156ecf197750b7d1 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 4 Jul 2022 14:02:58 +0200 Subject: [PATCH] 4.9-stable patches added patches: net-usb-ax88179_178a-fix-packet-receiving.patch usbnet-fix-memory-allocation-in-helpers.patch usbnet-make-sure-no-null-pointer-is-passed-through.patch --- ...sb-ax88179_178a-fix-packet-receiving.patch | 230 ++++++++++++++++++ queue-4.9/series | 3 + ...net-fix-memory-allocation-in-helpers.patch | 45 ++++ ...re-no-null-pointer-is-passed-through.patch | 61 +++++ 4 files changed, 339 insertions(+) create mode 100644 queue-4.9/net-usb-ax88179_178a-fix-packet-receiving.patch create mode 100644 queue-4.9/usbnet-fix-memory-allocation-in-helpers.patch create mode 100644 queue-4.9/usbnet-make-sure-no-null-pointer-is-passed-through.patch diff --git a/queue-4.9/net-usb-ax88179_178a-fix-packet-receiving.patch b/queue-4.9/net-usb-ax88179_178a-fix-packet-receiving.patch new file mode 100644 index 00000000000..7d70338b523 --- /dev/null +++ b/queue-4.9/net-usb-ax88179_178a-fix-packet-receiving.patch @@ -0,0 +1,230 @@ +From f8ebb3ac881b17712e1d5967c97ab1806b16d3d6 Mon Sep 17 00:00:00 2001 +From: Jose Alonso +Date: Tue, 28 Jun 2022 12:13:02 -0300 +Subject: net: usb: ax88179_178a: Fix packet receiving + +From: Jose Alonso + +commit f8ebb3ac881b17712e1d5967c97ab1806b16d3d6 upstream. + +This patch corrects packet receiving in ax88179_rx_fixup. + +- problem observed: + ifconfig shows allways a lot of 'RX Errors' while packets + are received normally. + + This occurs because ax88179_rx_fixup does not recognise properly + the usb urb received. + The packets are normally processed and at the end, the code exits + with 'return 0', generating RX Errors. + (pkt_cnt==-2 and ptk_hdr over field rx_hdr trying to identify + another packet there) + + This is a usb urb received by "tcpdump -i usbmon2 -X" on a + little-endian CPU: + 0x0000: eeee f8e3 3b19 87a0 94de 80e3 daac 0800 + ^ packet 1 start (pkt_len = 0x05ec) + ^^^^ IP alignment pseudo header + ^ ethernet packet start + last byte ethernet packet v + padding (8-bytes aligned) vvvv vvvv + 0x05e0: c92d d444 1420 8a69 83dd 272f e82b 9811 + 0x05f0: eeee f8e3 3b19 87a0 94de 80e3 daac 0800 + ... ^ packet 2 + 0x0be0: eeee f8e3 3b19 87a0 94de 80e3 daac 0800 + ... + 0x1130: 9d41 9171 8a38 0ec5 eeee f8e3 3b19 87a0 + ... + 0x1720: 8cfc 15ff 5e4c e85c eeee f8e3 3b19 87a0 + ... + 0x1d10: ecfa 2a3a 19ab c78c eeee f8e3 3b19 87a0 + ... + 0x2070: eeee f8e3 3b19 87a0 94de 80e3 daac 0800 + ... ^ packet 7 + 0x2120: 7c88 4ca5 5c57 7dcc 0d34 7577 f778 7e0a + 0x2130: f032 e093 7489 0740 3008 ec05 0000 0080 + ====1==== ====2==== + hdr_off ^ + pkt_len = 0x05ec ^^^^ + AX_RXHDR_*=0x00830 ^^^^ ^ + pkt_len = 0 ^^^^ + AX_RXHDR_DROP_ERR=0x80000000 ^^^^ ^ + 0x2140: 3008 ec05 0000 0080 3008 5805 0000 0080 + 0x2150: 3008 ec05 0000 0080 3008 ec05 0000 0080 + 0x2160: 3008 5803 0000 0080 3008 c800 0000 0080 + ===11==== ===12==== ===13==== ===14==== + 0x2170: 0000 0000 0e00 3821 + ^^^^ ^^^^ rx_hdr + ^^^^ pkt_cnt=14 + ^^^^ hdr_off=0x2138 + ^^^^ ^^^^ padding + + The dump shows that pkt_cnt is the number of entrys in the + per-packet metadata. It is "2 * packet count". + Each packet have two entrys. The first have a valid + value (pkt_len and AX_RXHDR_*) and the second have a + dummy-header 0x80000000 (pkt_len=0 with AX_RXHDR_DROP_ERR). + Why exists dummy-header for each packet?!? + My guess is that this was done probably to align the + entry for each packet to 64-bits and maintain compatibility + with old firmware. + There is also a padding (0x00000000) before the rx_hdr to + align the end of rx_hdr to 64-bit. + Note that packets have a alignment of 64-bits (8-bytes). + + This patch assumes that the dummy-header and the last + padding are optional. So it preserves semantics and + recognises the same valid packets as the current code. + + This patch was made using only the dumpfile information and + tested with only one device: + 0b95:1790 ASIX Electronics Corp. AX88179 Gigabit Ethernet + +Fixes: 57bc3d3ae8c1 ("net: usb: ax88179_178a: Fix out-of-bounds accesses in RX fixup") +Fixes: e2ca90c276e1 ("ax88179_178a: ASIX AX88179_178A USB 3.0/2.0 to gigabit ethernet adapter driver") +Signed-off-by: Jose Alonso +Acked-by: Paolo Abeni +Link: https://lore.kernel.org/r/d6970bb04bf67598af4d316eaeb1792040b18cfd.camel@gmail.com +Signed-off-by: Paolo Abeni +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/usb/ax88179_178a.c | 101 ++++++++++++++++++++++++++++++----------- + 1 file changed, 76 insertions(+), 25 deletions(-) + +--- a/drivers/net/usb/ax88179_178a.c ++++ b/drivers/net/usb/ax88179_178a.c +@@ -1373,6 +1373,42 @@ static int ax88179_rx_fixup(struct usbne + * are bundled into this buffer and where we can find an array of + * per-packet metadata (which contains elements encoded into u16). + */ ++ ++ /* SKB contents for current firmware: ++ * ++ * ... ++ * ++ * ++ * ... ++ * ++ * ++ * ++ * where: ++ * contains pkt_len bytes: ++ * 2 bytes of IP alignment pseudo header ++ * packet received ++ * contains 4 bytes: ++ * pkt_len and fields AX_RXHDR_* ++ * 0-7 bytes to terminate at ++ * 8 bytes boundary (64-bit). ++ * 4 bytes to make rx_hdr terminate at ++ * 8 bytes boundary (64-bit) ++ * contains 4 bytes: ++ * pkt_len=0 and AX_RXHDR_DROP_ERR ++ * contains 4 bytes: ++ * pkt_cnt and hdr_off (offset of ++ * ) ++ * ++ * pkt_cnt is number of entrys in the per-packet metadata. ++ * In current firmware there is 2 entrys per packet. ++ * The first points to the packet and the ++ * second is a dummy header. ++ * This was done probably to align fields in 64-bit and ++ * maintain compatibility with old firmware. ++ * This code assumes that and are ++ * optional. ++ */ ++ + if (skb->len < 4) + return 0; + skb_trim(skb, skb->len - 4); +@@ -1387,51 +1423,66 @@ static int ax88179_rx_fixup(struct usbne + /* Make sure that the bounds of the metadata array are inside the SKB + * (and in front of the counter at the end). + */ +- if (pkt_cnt * 2 + hdr_off > skb->len) ++ if (pkt_cnt * 4 + hdr_off > skb->len) + return 0; + pkt_hdr = (u32 *)(skb->data + hdr_off); + + /* Packets must not overlap the metadata array */ + skb_trim(skb, hdr_off); + +- for (; ; pkt_cnt--, pkt_hdr++) { ++ for (; pkt_cnt > 0; pkt_cnt--, pkt_hdr++) { ++ u16 pkt_len_plus_padd; + u16 pkt_len; + + le32_to_cpus(pkt_hdr); + pkt_len = (*pkt_hdr >> 16) & 0x1fff; ++ pkt_len_plus_padd = (pkt_len + 7) & 0xfff8; + +- if (pkt_len > skb->len) ++ /* Skip dummy header used for alignment ++ */ ++ if (pkt_len == 0) ++ continue; ++ ++ if (pkt_len_plus_padd > skb->len) + return 0; + + /* Check CRC or runt packet */ +- if (((*pkt_hdr & (AX_RXHDR_CRC_ERR | AX_RXHDR_DROP_ERR)) == 0) && +- pkt_len >= 2 + ETH_HLEN) { +- bool last = (pkt_cnt == 0); +- +- if (last) { +- ax_skb = skb; +- } else { +- ax_skb = skb_clone(skb, GFP_ATOMIC); +- if (!ax_skb) +- return 0; +- } +- ax_skb->len = pkt_len; +- /* Skip IP alignment pseudo header */ +- skb_pull(ax_skb, 2); +- skb_set_tail_pointer(ax_skb, ax_skb->len); +- ax_skb->truesize = pkt_len + sizeof(struct sk_buff); +- ax88179_rx_checksum(ax_skb, pkt_hdr); ++ if ((*pkt_hdr & (AX_RXHDR_CRC_ERR | AX_RXHDR_DROP_ERR)) || ++ pkt_len < 2 + ETH_HLEN) { ++ dev->net->stats.rx_errors++; ++ skb_pull(skb, pkt_len_plus_padd); ++ continue; ++ } + +- if (last) +- return 1; ++ /* last packet */ ++ if (pkt_len_plus_padd == skb->len) { ++ skb_trim(skb, pkt_len); + +- usbnet_skb_return(dev, ax_skb); ++ /* Skip IP alignment pseudo header */ ++ skb_pull(skb, 2); ++ ++ skb->truesize = SKB_TRUESIZE(pkt_len_plus_padd); ++ ax88179_rx_checksum(skb, pkt_hdr); ++ return 1; + } + +- /* Trim this packet away from the SKB */ +- if (!skb_pull(skb, (pkt_len + 7) & 0xFFF8)) ++ ax_skb = skb_clone(skb, GFP_ATOMIC); ++ if (!ax_skb) + return 0; ++ skb_trim(ax_skb, pkt_len); ++ ++ /* Skip IP alignment pseudo header */ ++ skb_pull(ax_skb, 2); ++ ++ skb->truesize = pkt_len_plus_padd + ++ SKB_DATA_ALIGN(sizeof(struct sk_buff)); ++ ax88179_rx_checksum(ax_skb, pkt_hdr); ++ usbnet_skb_return(dev, ax_skb); ++ ++ skb_pull(skb, pkt_len_plus_padd); + } ++ ++ return 0; + } + + static struct sk_buff * diff --git a/queue-4.9/series b/queue-4.9/series index e991f924ec6..d1a7653393a 100644 --- a/queue-4.9/series +++ b/queue-4.9/series @@ -1,3 +1,6 @@ dm-raid-fix-kasan-warning-in-raid5_add_disks.patch sunrpc-fix-read_plus-crasher.patch net-rose-fix-uaf-bugs-caused-by-timer-handler.patch +net-usb-ax88179_178a-fix-packet-receiving.patch +usbnet-make-sure-no-null-pointer-is-passed-through.patch +usbnet-fix-memory-allocation-in-helpers.patch diff --git a/queue-4.9/usbnet-fix-memory-allocation-in-helpers.patch b/queue-4.9/usbnet-fix-memory-allocation-in-helpers.patch new file mode 100644 index 00000000000..81ddbbcfa49 --- /dev/null +++ b/queue-4.9/usbnet-fix-memory-allocation-in-helpers.patch @@ -0,0 +1,45 @@ +From e65af5403e462ccd7dff6a045a886c64da598c2e Mon Sep 17 00:00:00 2001 +From: Oliver Neukum +Date: Tue, 28 Jun 2022 11:35:17 +0200 +Subject: usbnet: fix memory allocation in helpers + +From: Oliver Neukum + +commit e65af5403e462ccd7dff6a045a886c64da598c2e upstream. + +usbnet provides some helper functions that are also used in +the context of reset() operations. During a reset the other +drivers on a device are unable to operate. As that can be block +drivers, a driver for another interface cannot use paging +in its memory allocations without risking a deadlock. +Use GFP_NOIO in the helpers. + +Fixes: 877bd862f32b8 ("usbnet: introduce usbnet 3 command helpers") +Signed-off-by: Oliver Neukum +Link: https://lore.kernel.org/r/20220628093517.7469-1-oneukum@suse.com +Signed-off-by: Jakub Kicinski +Signed-off-by: Greg Kroah-Hartman +--- + drivers/net/usb/usbnet.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/net/usb/usbnet.c ++++ b/drivers/net/usb/usbnet.c +@@ -1952,7 +1952,7 @@ static int __usbnet_read_cmd(struct usbn + cmd, reqtype, value, index, size); + + if (size) { +- buf = kmalloc(size, GFP_KERNEL); ++ buf = kmalloc(size, GFP_NOIO); + if (!buf) + goto out; + } +@@ -1984,7 +1984,7 @@ static int __usbnet_write_cmd(struct usb + cmd, reqtype, value, index, size); + + if (data) { +- buf = kmemdup(data, size, GFP_KERNEL); ++ buf = kmemdup(data, size, GFP_NOIO); + if (!buf) + goto out; + } else { diff --git a/queue-4.9/usbnet-make-sure-no-null-pointer-is-passed-through.patch b/queue-4.9/usbnet-make-sure-no-null-pointer-is-passed-through.patch new file mode 100644 index 00000000000..e898e352990 --- /dev/null +++ b/queue-4.9/usbnet-make-sure-no-null-pointer-is-passed-through.patch @@ -0,0 +1,61 @@ +From 6c22fce07c97f765af1808ec3be007847e0b47d1 Mon Sep 17 00:00:00 2001 +From: Oliver Neukum +Date: Wed, 5 Apr 2017 14:14:39 +0200 +Subject: usbnet: make sure no NULL pointer is passed through + +From: Oliver Neukum + +commit 6c22fce07c97f765af1808ec3be007847e0b47d1 upstream. + +Coverity reports: + +** CID 751368: Null pointer dereferences (FORWARD_NULL) +/drivers/net/usb/usbnet.c: 1925 in __usbnet_read_cmd() + +________________________________________________________________________________________________________ +--- + drivers/net/usb/usbnet.c | 19 +++++++++++++++---- + 1 file changed, 15 insertions(+), 4 deletions(-) + +--- a/drivers/net/usb/usbnet.c ++++ b/drivers/net/usb/usbnet.c +@@ -1951,7 +1951,7 @@ static int __usbnet_read_cmd(struct usbn + " value=0x%04x index=0x%04x size=%d\n", + cmd, reqtype, value, index, size); + +- if (data) { ++ if (size) { + buf = kmalloc(size, GFP_KERNEL); + if (!buf) + goto out; +@@ -1960,8 +1960,13 @@ static int __usbnet_read_cmd(struct usbn + err = usb_control_msg(dev->udev, usb_rcvctrlpipe(dev->udev, 0), + cmd, reqtype, value, index, buf, size, + USB_CTRL_GET_TIMEOUT); +- if (err > 0 && err <= size) +- memcpy(data, buf, err); ++ if (err > 0 && err <= size) { ++ if (data) ++ memcpy(data, buf, err); ++ else ++ netdev_dbg(dev->net, ++ "Huh? Data requested but thrown away.\n"); ++ } + kfree(buf); + out: + return err; +@@ -1982,7 +1987,13 @@ static int __usbnet_write_cmd(struct usb + buf = kmemdup(data, size, GFP_KERNEL); + if (!buf) + goto out; +- } ++ } else { ++ if (size) { ++ WARN_ON_ONCE(1); ++ err = -EINVAL; ++ goto out; ++ } ++ } + + err = usb_control_msg(dev->udev, usb_sndctrlpipe(dev->udev, 0), + cmd, reqtype, value, index, buf, size, -- 2.47.3