Commit 1572667d authored by Alan Stern's avatar Alan Stern Committed by sanglipeng1
Browse files

usb: Fix regression caused by invalid ep0 maxpacket in virtual SuperSpeed device 

stable inclusion
from stable-v5.10.217
commit 399ca46db738af2d8488a0bee6ff862292ab1ec5
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAWLXC

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=399ca46db738af2d8488a0bee6ff862292ab1ec5

--------------------------------

commit c78c3644b772e356ca452ae733a3c4de0fb11dc8 upstream.

A virtual SuperSpeed device in the FreeBSD BVCP package
(https://bhyve.npulse.net/

) presents an invalid ep0 maxpacket size of 256.
It stopped working with Linux following a recent commit because now we
check these sizes more carefully than before.

Fix this regression by using the bMaxpacketSize0 value in the device
descriptor for SuperSpeed or faster devices, even if it is invalid.  This
is a very simple-minded change; we might want to check more carefully for
values that actually make some sense (for instance, no smaller than 64).

Signed-off-by: default avatarAlan Stern <stern@rowland.harvard.edu>
Reported-and-tested-by: default avatarRoger Whittaker <roger.whittaker@suse.com>
Closes: https://bugzilla.suse.com/show_bug.cgi?id=1220569
Link: https://lore.kernel.org/linux-usb/9efbd569-7059-4575-983f-0ea30df41871@suse.com/
Fixes: 59cf4457 ("USB: core: Fix oversight in SuperSpeed initialization")
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/4058ac05-237c-4db4-9ecc-5af42bdb4501@rowland.harvard.edu


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent 5cff7073

drivers/usb/core/hub.c

+3 −2
Original line number Diff line number Diff line
@@ -5052,9 +5052,10 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1, 
	}

	if (usb_endpoint_maxp(&udev->ep0.desc) == i) {

		;	/* Initial ep0 maxpacket guess is right */

	} else if ((udev->speed == USB_SPEED_FULL ||

	} else if (((udev->speed == USB_SPEED_FULL ||

				udev->speed == USB_SPEED_HIGH) &&

			(i == 8 || i == 16 || i == 32 || i == 64)) {

			(i == 8 || i == 16 || i == 32 || i == 64)) ||

			(udev->speed >= USB_SPEED_SUPER && i > 0)) {

		/* Initial guess is wrong; use the descriptor's value */

		if (udev->speed == USB_SPEED_FULL)

			dev_dbg(&udev->dev, "ep0 maxpacket = %d\n", i);