From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: USB: core: Fix misuse of USB_DT_USB_SSP_CAP_SIZE() From: Masakazu Mokuno Message-Id: <20171220031406.9B5E.F48FD4B1@gmail.com> Date: Wed, 20 Dec 2017 03:14:09 +0900 To: linux-usb@vger.kernel.org Cc: Mathias Nyman , linux-stable List-ID: QXMgVVNCX0RUX1VTQl9TU1BfQ0FQX1NJWkUoKSB0YWtlcyBTU0FDIHZhbHVlIGFzIGFuIGFyZ3Vt ZW50LCB0aGUgbG93CmJvdW5kIG9mIHRoZSBzaXplIGZvciBzdHJ1Y3QgdXNiX3NzcF9jYXBfZGVz Y3JpcHRvciBzaG91bGQgYmUgZGVzY3JpYmVkCmJ5IFVTQl9EVF9VU0JfU1NQX0NBUF9TSVpFKDAp LCBub3QgYnkgVVNCX0RUX1VTQl9TU1BfQ0FQX1NJWkUoMSkKClRoZSB0eXBlLXNwZWNpZmljIGxl bmd0aCBjaGVjayBwYXRjaCB3YXMgYWRkZWQgdG8gc3RhYmxlIGFuZCBuZWVkcyB0byBiZQpmaXhl ZCBhcyB3ZWxsLgoKRml4ZXM6IDgxY2Y0YTQ1MzYwZiAoIlVTQjogY29yZTogQWRkIHR5cGUtc3Bl Y2lmaWMgbGVuZ3RoIGNoZWNrIG9mIEJPUwpkZXNjcmlwdG9ycyIpCkNjOiBsaW51eC1zdGFibGUg PHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmc+CkNjOiBNYXRoaWFzIE55bWFuIDxtYXRoaWFzLm55bWFu QGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWFzYWthenUgTW9rdW5vIDxtYXNha2F6 dS5tb2t1bm9AZ21haWwuY29tPgoKZGlmZiAtLWdpdCBhL2RyaXZlcnMvdXNiL2NvcmUvY29uZmln LmMgYi9kcml2ZXJzL3VzYi9jb3JlL2NvbmZpZy5jCmluZGV4IDc4ZTkyZDIuLjMzYTNhYjcgMTAw NjQ0Ci0tLSBhL2RyaXZlcnMvdXNiL2NvcmUvY29uZmlnLmMKKysrIGIvZHJpdmVycy91c2IvY29y ZS9jb25maWcuYwpAQCAtOTExLDcgKzkxMSw3IEBAIHZvaWQgdXNiX3JlbGVhc2VfYm9zX2Rlc2Ny aXB0b3Ioc3RydWN0IHVzYl9kZXZpY2UgKmRldikKICAgICAgICBbVVNCX0NBUF9UWVBFX1dJUkVM RVNTX1VTQl0gPSBVU0JfRFRfVVNCX1dJUkVMRVNTX0NBUF9TSVpFLAogICAgICAgIFtVU0JfQ0FQ X1RZUEVfRVhUXSAgICAgICAgICA9IFVTQl9EVF9VU0JfRVhUX0NBUF9TSVpFLAogICAgICAgIFtV U0JfU1NfQ0FQX1RZUEVdICAgICAgICAgICA9IFVTQl9EVF9VU0JfU1NfQ0FQX1NJWkUsCi0gICAg ICAgW1VTQl9TU1BfQ0FQX1RZUEVdICAgICAgICAgID0gVVNCX0RUX1VTQl9TU1BfQ0FQX1NJWkUo MSksCisgICAgICAgW1VTQl9TU1BfQ0FQX1RZUEVdICAgICAgICAgID0gVVNCX0RUX1VTQl9TU1Bf Q0FQX1NJWkUoMCksCiAgICAgICAgW0NPTlRBSU5FUl9JRF9UWVBFXSAgICAgICAgID0gVVNCX0RU X1VTQl9TU19DT05UTl9JRF9TSVpFLAogICAgICAgIFtVU0JfUFRNX0NBUF9UWVBFXSAgICAgICAg ICA9IFVTQl9EVF9VU0JfUFRNX0lEX1NJWkUsCiB9Owo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f195.google.com ([209.85.192.195]:36072 "EHLO mail-pf0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751129AbdLSSOK (ORCPT ); Tue, 19 Dec 2017 13:14:10 -0500 Date: Wed, 20 Dec 2017 03:14:09 +0900 From: Masakazu Mokuno To: linux-usb@vger.kernel.org Subject: [PATCH] USB: core: Fix misuse of USB_DT_USB_SSP_CAP_SIZE() Cc: Mathias Nyman , linux-stable Message-Id: <20171220031406.9B5E.F48FD4B1@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Content-Transfer-Encoding: 7bit Sender: stable-owner@vger.kernel.org List-ID: 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 Cc: Mathias Nyman Signed-off-by: Masakazu Mokuno -- drivers/usb/core/config.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/usb/core/config.c b/drivers/usb/core/config.c index 78e92d2..33a3ab7 100644 --- a/drivers/usb/core/config.c +++ b/drivers/usb/core/config.c @@ -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, }; -- Masakazu Mokuno