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: <20180112004750.C03B.F48FD4B1@gmail.com> Date: Fri, 12 Jan 2018 00:47:53 +0900 To: Greg KH Cc: linux-usb@vger.kernel.org, Mathias Nyman , linux-stable List-ID: SGksCgpPbiBUdWUsIDkgSmFuIDIwMTggMTY6MDY6NDEgKzAxMDAKR3JlZyBLSCA8Z3JlZ2toQGxp bnV4Zm91bmRhdGlvbi5vcmc+IHdyb3RlOgoKPiBPbiBXZWQsIERlYyAyMCwgMjAxNyBhdCAwMzox NDowOUFNICswOTAwLCBNYXNha2F6dSBNb2t1bm8gd3JvdGU6Cj4gPiBBcyBVU0JfRFRfVVNCX1NT UF9DQVBfU0laRSgpIHRha2VzIFNTQUMgdmFsdWUgYXMgYW4gYXJndW1lbnQsIHRoZSBsb3cKPiA+ IGJvdW5kIG9mIHRoZSBzaXplIGZvciBzdHJ1Y3QgdXNiX3NzcF9jYXBfZGVzY3JpcHRvciBzaG91 bGQgYmUgZGVzY3JpYmVkCj4gPiBieSBVU0JfRFRfVVNCX1NTUF9DQVBfU0laRSgwKSwgbm90IGJ5 IFVTQl9EVF9VU0JfU1NQX0NBUF9TSVpFKDEpCj4gPiAKPiA+IFRoZSB0eXBlLXNwZWNpZmljIGxl bmd0aCBjaGVjayBwYXRjaCB3YXMgYWRkZWQgdG8gc3RhYmxlIGFuZCBuZWVkcyB0byBiZQo+ID4g Zml4ZWQgYXMgd2VsbC4KPiA+IAo+ID4gRml4ZXM6IDgxY2Y0YTQ1MzYwZiAoIlVTQjogY29yZTog QWRkIHR5cGUtc3BlY2lmaWMgbGVuZ3RoIGNoZWNrIG9mIEJPUwo+ID4gZGVzY3JpcHRvcnMiKQo+ ID4gQ2M6IGxpbnV4LXN0YWJsZSA8c3RhYmxlQHZnZXIua2VybmVsLm9yZz4KPiA+IENjOiBNYXRo aWFzIE55bWFuIDxtYXRoaWFzLm55bWFuQGxpbnV4LmludGVsLmNvbT4KPiA+IFNpZ25lZC1vZmYt Ynk6IE1hc2FrYXp1IE1va3VubyA8bWFzYWthenUubW9rdW5vQGdtYWlsLmNvbT4KPiA+IAo+ID4g LS0gCj4gPiAKPiA+ICBkcml2ZXJzL3VzYi9jb3JlL2NvbmZpZy5jIHwgMiArLQo+ID4gIDEgZmls ZSBjaGFuZ2VkLCAxIGluc2VydGlvbigrKSwgMSBkZWxldGlvbigtKQo+ID4gCj4gPiBkaWZmIC0t Z2l0IGEvZHJpdmVycy91c2IvY29yZS9jb25maWcuYyBiL2RyaXZlcnMvdXNiL2NvcmUvY29uZmln LmMKPiA+IGluZGV4IDc4ZTkyZDIuLjMzYTNhYjcgMTAwNjQ0Cj4gPiAtLS0gYS9kcml2ZXJzL3Vz Yi9jb3JlL2NvbmZpZy5jCj4gPiArKysgYi9kcml2ZXJzL3VzYi9jb3JlL2NvbmZpZy5jCj4gPiBA QCAtOTExLDcgKzkxMSw3IEBAIHZvaWQgdXNiX3JlbGVhc2VfYm9zX2Rlc2NyaXB0b3Ioc3RydWN0 IHVzYl9kZXZpY2UgKmRldikKPiA+ICAgICAgICAgW1VTQl9DQVBfVFlQRV9XSVJFTEVTU19VU0Jd ID0gVVNCX0RUX1VTQl9XSVJFTEVTU19DQVBfU0laRSwKPiA+ICAgICAgICAgW1VTQl9DQVBfVFlQ RV9FWFRdICAgICAgICAgID0gVVNCX0RUX1VTQl9FWFRfQ0FQX1NJWkUsCj4gPiAgICAgICAgIFtV U0JfU1NfQ0FQX1RZUEVdICAgICAgICAgICA9IFVTQl9EVF9VU0JfU1NfQ0FQX1NJWkUsCj4gPiAt ICAgICAgIFtVU0JfU1NQX0NBUF9UWVBFXSAgICAgICAgICA9IFVTQl9EVF9VU0JfU1NQX0NBUF9T SVpFKDEpLAo+ID4gKyAgICAgICBbVVNCX1NTUF9DQVBfVFlQRV0gICAgICAgICAgPSBVU0JfRFRf VVNCX1NTUF9DQVBfU0laRSgwKSwKPiA+ICAgICAgICAgW0NPTlRBSU5FUl9JRF9UWVBFXSAgICAg ICAgID0gVVNCX0RUX1VTQl9TU19DT05UTl9JRF9TSVpFLAo+ID4gICAgICAgICBbVVNCX1BUTV9D QVBfVFlQRV0gICAgICAgICAgPSBVU0JfRFRfVVNCX1BUTV9JRF9TSVpFLAo+ID4gIH07Cj4gPiAK PiA+IC0tIAo+ID4gTWFzYWthenUgTW9rdW5vCj4gCj4gUGF0Y2ggaXMgY29ycnVwdGVkIGFuZCBj YW4gbm90IGJlIGFwcGxpZWQgOigKCkknbSBzb3JyeS4gIFRhYnMgd2VyZSBleHBhbmVkIHRvIHdo aXRlIHNwYWNlcy4gSSdsbCByZXNlbmQgZml4ZWQgcGF0Y2guCg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pf0-f196.google.com ([209.85.192.196]:43645 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932468AbeAKPrx (ORCPT ); Thu, 11 Jan 2018 10:47:53 -0500 From: Masakazu Mokuno Date: Fri, 12 Jan 2018 00:47:53 +0900 To: Greg KH Subject: Re: [PATCH] USB: core: Fix misuse of USB_DT_USB_SSP_CAP_SIZE() Cc: linux-usb@vger.kernel.org, Mathias Nyman , linux-stable In-Reply-To: <20180109150641.GA11123@kroah.com> References: <20171220031406.9B5E.F48FD4B1@gmail.com> <20180109150641.GA11123@kroah.com> Message-Id: <20180112004750.C03B.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: Hi, On Tue, 9 Jan 2018 16:06:41 +0100 Greg KH wrote: > On Wed, Dec 20, 2017 at 03:14:09AM +0900, Masakazu Mokuno wrote: > > 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 > > Patch is corrupted and can not be applied :( I'm sorry. Tabs were expaned to white spaces. I'll resend fixed patch. -- Masakazu Mokuno