diff options
| author | Alan Stern | 2018-05-03 17:04:48 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2018-05-03 19:16:38 +0200 |
| commit | fb5ee84ea72c5f1b6cabdd1c9d6e8648995ca7c6 (patch) | |
| tree | 0bc3daa3d7ac428782316d38ed59b42691d4b7c0 | |
| parent | xhci: Fix use-after-free in xhci_free_virt_device (diff) | |
| download | kernel-qcow2-linux-fb5ee84ea72c5f1b6cabdd1c9d6e8648995ca7c6.tar.gz kernel-qcow2-linux-fb5ee84ea72c5f1b6cabdd1c9d6e8648995ca7c6.tar.xz kernel-qcow2-linux-fb5ee84ea72c5f1b6cabdd1c9d6e8648995ca7c6.zip | |
USB: Accept bulk endpoints with 1024-byte maxpacket
Some non-compliant high-speed USB devices have bulk endpoints with a
1024-byte maxpacket size. Although such endpoints don't work with
xHCI host controllers, they do work with EHCI controllers. We used to
accept these invalid sizes (with a warning), but we no longer do
because of an unintentional change introduced by commit aed9d65ac327
("USB: validate wMaxPacketValue entries in endpoint descriptors").
This patch restores the old behavior, so that people with these
peculiar devices can use them without patching their kernels by hand.
Signed-off-by: Alan Stern <stern@rowland.harvard.edu>
Suggested-by: Elvinas <elvinas@veikia.lt>
Fixes: aed9d65ac327 ("USB: validate wMaxPacketValue entries in endpoint descriptors")
CC: <stable@vger.kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | drivers/usb/core/config.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c index c821b4b9647e..7b5cb28ffb35 100644 --- a/drivers/usb/core/config.c +++ b/drivers/usb/core/config.c @@ -191,7 +191,9 @@ static const unsigned short full_speed_maxpacket_maxes[4] = { static const unsigned short high_speed_maxpacket_maxes[4] = { [USB_ENDPOINT_XFER_CONTROL] = 64, [USB_ENDPOINT_XFER_ISOC] = 1024, - [USB_ENDPOINT_XFER_BULK] = 512, + + /* Bulk should be 512, but some devices use 1024: we will warn below */ + [USB_ENDPOINT_XFER_BULK] = 1024, [USB_ENDPOINT_XFER_INT] = 1024, }; static const unsigned short super_speed_maxpacket_maxes[4] = { |