summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Mork <bjorn@mork.no>2019-09-18 14:17:38 +0200
committerJakub Kicinski <jakub.kicinski@netronome.com>2019-09-21 12:06:55 -0700
commit8d3d7c2029c1b360f1a6b0a2fca470b57eb575c0 (patch)
tree960260760a86a6189cf73fc2c9bee21a44af7e0a
parent3fe4b3351301660653a2bc73f2226da0ebd2b95e (diff)
downloadlinux-8d3d7c2029c1b360f1a6b0a2fca470b57eb575c0.tar.gz
linux-8d3d7c2029c1b360f1a6b0a2fca470b57eb575c0.tar.bz2
linux-8d3d7c2029c1b360f1a6b0a2fca470b57eb575c0.zip
usbnet: ignore endpoints with invalid wMaxPacketSize
Endpoints with zero wMaxPacketSize are not usable for transferring data. Ignore such endpoints when looking for valid in, out and status pipes, to make the drivers more robust against invalid and meaningless descriptors. The wMaxPacketSize of these endpoints are used for memory allocations and as divisors in many usbnet minidrivers. Avoiding zero is therefore critical. Signed-off-by: Bjørn Mork <bjorn@mork.no> Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
-rw-r--r--drivers/net/usb/usbnet.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/net/usb/usbnet.c b/drivers/net/usb/usbnet.c
index e44849499b89..dde05e2fdc3e 100644
--- a/drivers/net/usb/usbnet.c
+++ b/drivers/net/usb/usbnet.c
@@ -100,6 +100,11 @@ int usbnet_get_endpoints(struct usbnet *dev, struct usb_interface *intf)
int intr = 0;
e = alt->endpoint + ep;
+
+ /* ignore endpoints which cannot transfer data */
+ if (!usb_endpoint_maxp(&e->desc))
+ continue;
+
switch (e->desc.bmAttributes) {
case USB_ENDPOINT_XFER_INT:
if (!usb_endpoint_dir_in(&e->desc))