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: [v2] USB: core: Fix misuse of USB_DT_USB_SSP_CAP_SIZE() From: Masakazu Mokuno Message-Id: <20180112010326.C03F.F48FD4B1@gmail.com> Date: Fri, 12 Jan 2018 01:03:29 +0900 To: linux-usb@vger.kernel.org Cc: Mathias Nyman , linux-stable List-ID: QXMgVVNCX0RUX1VTQl9TU1BfQ0FQX1NJWkUoKSB0YWtlcyBTU0FDIHZhbHVlIGFzIGFuIGFyZ3Vt ZW50LCB0aGUgbG93CmJvdW5kIG9mIHRoZSBzaXplIGZvciBzdHJ1Y3QgdXNiX3NzcF9jYXBfZGVz Y3JpcHRvciBzaG91bGQgYmUgZGVzY3JpYmVkCmJ5IFVTQl9EVF9VU0JfU1NQX0NBUF9TSVpFKDAp LCBub3QgYnkgVVNCX0RUX1VTQl9TU1BfQ0FQX1NJWkUoMSkKClRoZSB0eXBlLXNwZWNpZmljIGxl bmd0aCBjaGVjayBwYXRjaCB3YXMgYWRkZWQgdG8gc3RhYmxlIGFuZCBuZWVkcyB0byBiZQpmaXhl ZCBhcyB3ZWxsLgoKRml4ZXM6IDgxY2Y0YTQ1MzYwZiAoIlVTQjogY29yZTogQWRkIHR5cGUtc3Bl Y2lmaWMgbGVuZ3RoIGNoZWNrIG9mIEJPUwpkZXNjcmlwdG9ycyIpCkNjOiBsaW51eC1zdGFibGUg PHN0YWJsZUB2Z2VyLmtlcm5lbC5vcmc+CkNjOiBNYXRoaWFzIE55bWFuIDxtYXRoaWFzLm55bWFu QGxpbnV4LmludGVsLmNvbT4KU2lnbmVkLW9mZi1ieTogTWFzYWthenUgTW9rdW5vIDxtYXNha2F6 dS5tb2t1bm9AZ21haWwuY29tPgotLS0KY2hhbmdlcyBmcm9tIHYxOgogICogRml4ZWQgdW50YWJp ZmllZCB0YWJzIGluIHRoZSBwYXRjaAoKIGRyaXZlcnMvdXNiL2NvcmUvY29uZmlnLmMgfCAyICst CiAxIGZpbGUgY2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDEgZGVsZXRpb24oLSkKCmRpZmYgLS1n aXQgYS9kcml2ZXJzL3VzYi9jb3JlL2NvbmZpZy5jIGIvZHJpdmVycy91c2IvY29yZS9jb25maWcu YwppbmRleCA3OGU5MmQyLi4zM2EzYWI3IDEwMDY0NAotLS0gYS9kcml2ZXJzL3VzYi9jb3JlL2Nv bmZpZy5jCisrKyBiL2RyaXZlcnMvdXNiL2NvcmUvY29uZmlnLmMKQEAgLTkxMSw3ICs5MTEsNyBA QCB2b2lkIHVzYl9yZWxlYXNlX2Jvc19kZXNjcmlwdG9yKHN0cnVjdCB1c2JfZGV2aWNlICpkZXYp CiAJW1VTQl9DQVBfVFlQRV9XSVJFTEVTU19VU0JdID0gVVNCX0RUX1VTQl9XSVJFTEVTU19DQVBf U0laRSwKIAlbVVNCX0NBUF9UWVBFX0VYVF0gICAgICAgICAgPSBVU0JfRFRfVVNCX0VYVF9DQVBf U0laRSwKIAlbVVNCX1NTX0NBUF9UWVBFXSAgICAgICAgICAgPSBVU0JfRFRfVVNCX1NTX0NBUF9T SVpFLAotCVtVU0JfU1NQX0NBUF9UWVBFXSAgICAgICAgICA9IFVTQl9EVF9VU0JfU1NQX0NBUF9T SVpFKDEpLAorCVtVU0JfU1NQX0NBUF9UWVBFXSAgICAgICAgICA9IFVTQl9EVF9VU0JfU1NQX0NB UF9TSVpFKDApLAogCVtDT05UQUlORVJfSURfVFlQRV0gICAgICAgICA9IFVTQl9EVF9VU0JfU1Nf Q09OVE5fSURfU0laRSwKIAlbVVNCX1BUTV9DQVBfVFlQRV0gICAgICAgICAgPSBVU0JfRFRfVVNC X1BUTV9JRF9TSVpFLAogfTsK From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f194.google.com ([209.85.192.194]:41569 "EHLO mail-pf0-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934098AbeAKQD3 (ORCPT ); Thu, 11 Jan 2018 11:03:29 -0500 From: Masakazu Mokuno Date: Fri, 12 Jan 2018 01:03:29 +0900 To: linux-usb@vger.kernel.org Subject: [PATCH v2] USB: core: Fix misuse of USB_DT_USB_SSP_CAP_SIZE() Cc: Mathias Nyman , linux-stable Message-Id: <20180112010326.C03F.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 --- changes from v1: * Fixed untabified tabs in the patch 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