Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6682bb39 authored by Sarah Sharp's avatar Sarah Sharp Committed by Greg Kroah-Hartman
Browse files

USB: Fix SS endpoint companion descriptor parsing. 



When there's a descriptor after the SuperSpeed endpoint companion
descriptor, the previous code would have skipped over twice the length it
was supposed to.  This code fixes crashes seen with UASP devices (which
have a UASP descriptor after the SS endpoint companion descriptor).

Signed-off-by: default avatarSarah Sharp <sarah.a.sharp@linux.intel.com>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 624defa1

drivers/usb/core/config.c

+1 −1
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ static int usb_parse_ss_endpoint_companion(struct device *ddev, int cfgno, 
	ep->ss_ep_comp->extralen = i;

	buffer += i;

	size -= i;

	retval = buffer - buffer_start + i;

	retval = buffer - buffer_start;

	if (num_skipped > 0)

		dev_dbg(ddev, "skipped %d descriptor%s after %s\n",

				num_skipped, plural(num_skipped),