summaryrefslogtreecommitdiffstats
path: root/drivers/net/usb
diff options
context:
space:
mode:
authorSzymon Heidrich <szymon.heidrich@gmail.com>2023-01-14 19:23:26 +0100
committerPaolo Abeni <pabeni@redhat.com>2023-01-17 11:50:42 +0100
commitecf7cf8efb59789e2b21d2f9ab926142579092b2 (patch)
tree142c803ebea653fbb70f96e5637266556cd5b494 /drivers/net/usb
parent87b93b678e95c7d93fe6a55b0e0fbda26d8c7760 (diff)
downloadlinux-stable-ecf7cf8efb59789e2b21d2f9ab926142579092b2.tar.gz
linux-stable-ecf7cf8efb59789e2b21d2f9ab926142579092b2.tar.bz2
linux-stable-ecf7cf8efb59789e2b21d2f9ab926142579092b2.zip
net: usb: sr9700: Handle negative len
Packet len computed as difference of length word extracted from skb data and four may result in a negative value. In such case processing of the buffer should be interrupted rather than setting sr_skb->len to an unexpectedly large value (due to cast from signed to unsigned integer) and passing sr_skb to usbnet_skb_return. Fixes: e9da0b56fe27 ("sr9700: sanity check for packet length") Signed-off-by: Szymon Heidrich <szymon.heidrich@gmail.com> Link: https://lore.kernel.org/r/20230114182326.30479-1-szymon.heidrich@gmail.com Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'drivers/net/usb')
-rw-r--r--drivers/net/usb/sr9700.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/usb/sr9700.c b/drivers/net/usb/sr9700.c
index 5a53e63d33a6..3164451e1010 100644
--- a/drivers/net/usb/sr9700.c
+++ b/drivers/net/usb/sr9700.c
@@ -413,7 +413,7 @@ static int sr9700_rx_fixup(struct usbnet *dev, struct sk_buff *skb)
/* ignore the CRC length */
len = (skb->data[1] | (skb->data[2] << 8)) - 4;
- if (len > ETH_FRAME_LEN || len > skb->len)
+ if (len > ETH_FRAME_LEN || len > skb->len || len < 0)
return 0;
/* the last packet of current skb */