Commit 96f23cb8 authored Sep 18, 2019 by Bjørn Mork Committed by Greg Kroah-Hartman Oct 05, 2019

usbnet: ignore endpoints with invalid wMaxPacketSize



[ Upstream commit 8d3d7c2029c1b360f1a6b0a2fca470b57eb575c0 ]

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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 0022f009

drivers/net/usb/usbnet.c

+5 −0

Original line number	Diff line number	Diff line
		@@ -114,6 +114,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))