patch "USB: Fix off by one in type-specific length check of BOS SSP" added to usb-linus
Subsystems (2)
This is a note to let you know that I've just added the patch titled
USB: Fix off by one in type-specific length check of BOS SSP
to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.
The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)
The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.
If you have any questions about this process, please let me know.
Quoted 1 line
From
07b9f12864d16c3a861aef4817eb1efccbc5d0e6Mon Sep 17 00:00:00 2001
From: Mathias Nyman <[email protected]>
Date: Tue, 19 Dec 2017 11:14:42 +0200
Subject: USB: Fix off by one in type-specific length check of BOS SSP
capability
USB 3.1 devices are not detected as 3.1 capable since 4.15-rc3 due to a off by one in commit 81cf4a45360f ("USB: core: Add type-specific length check of BOS descriptors")
It uses USB_DT_USB_SSP_CAP_SIZE() to get SSP capability size which takes the zero based SSAC as argument, not the actual count of sublink speed attributes.
USB3 spec 9.6.2.5 says "The number of Sublink Speed Attributes = SSAC + 1."
The type-specific length check patch was added to stable and needs to be fixed there as well
--- drivers/usb/core/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/core/config.c +1 -1
@@ -1007,7 +1007,7 @@ int usb_get_bos_descriptor(struct usb_device *dev)case USB_SSP_CAP_TYPE : ssp_cap = (struct usb_ssp_cap_descriptor *)buffer; ssac = (le32_to_cpu (ssp_cap->bmAttributes) & -USB_SSP_SUBLINK_SPEED_ATTRIBS ) +1 ; +USB_SSP_SUBLINK_SPEED_ATTRIBS );if (length >=USB_DT_USB_SSP_CAP_SIZE (ssac)) dev->bos->ssp_cap = ssp_cap;break ;
Signature · 1 line
2.15.1