Skip to contentSkip to conversation

USB: core: Fix misuse of USB_DT_USB_SSP_CAP_SIZE()

PATCH Masakazu Mokuno 1 participant 1 message Dec 19, 2017

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

As USB_DT_USB_SSP_CAP_SIZE() takes SSAC value as an argument, the low bound of the size for struct usb_ssp_cap_descriptor should be described by USB_DT_USB_SSP_CAP_SIZE(0), not by USB_DT_USB_SSP_CAP_SIZE(1)

The type-specific length check patch was added to stable and needs to be fixed as well.

Fixes 81cf4a45360f ("USB: core: Add type-specific length check of BOS

descriptors")

Cc linux-stable <[email protected]>
Cc Mathias Nyman <[email protected]>
drivers/usb/core/config.c +1 -1
index 78e92d2..33a3ab7 100644
@@ -911,7 +911,7 @@ void usb_release_bos_descriptor(struct usb_device *dev)
        [USB_CAP_TYPE_WIRELESS_USB] = USB_DT_USB_WIRELESS_CAP_SIZE,
        [USB_CAP_TYPE_EXT]          = USB_DT_USB_EXT_CAP_SIZE,
        [USB_SS_CAP_TYPE]           = USB_DT_USB_SS_CAP_SIZE,
-       [USB_SSP_CAP_TYPE]          = USB_DT_USB_SSP_CAP_SIZE(1),
+       [USB_SSP_CAP_TYPE]          = USB_DT_USB_SSP_CAP_SIZE(0),
        [CONTAINER_ID_TYPE]         = USB_DT_USB_SS_CONTN_ID_SIZE,
        [USB_PTM_CAP_TYPE]          = USB_DT_USB_PTM_ID_SIZE,
 };