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: option: Do not try to bind to ADB interfaces From: Greg Kroah-Hartman Message-Id: <20180723140801.GA4835@kroah.com> Date: Mon, 23 Jul 2018 16:08:01 +0200 To: Romain Izard Cc: Johan Hovold , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, stable List-ID: T24gTW9uLCBKdWwgMjMsIDIwMTggYXQgMDQ6MDI6MjBQTSArMDIwMCwgUm9tYWluIEl6YXJkIHdy b3RlOgo+IFNvbWUgbW9kZW1zIG5vdyB1c2UgdGhlIEFuZHJvaWQgRGVidWcgQnJpZGdlIHRvIHBy b3ZpZGUgYSBkZWJ1Z2dpbmcKPiBpbnRlcmZhY2UsIGFuZCBzb21lIHBob25lcyBjYW4gYWxzbyBl eHBvcnQgc2VyaWFsIHBvcnRzIG1hbmFnZWQgYnkgdGhlCj4gIm9wdGlvbiIgZHJpdmVyLgo+IAo+ IFRoZSBBREIgZGFlbW9uIHJ1bm5pbmcgaW4gdXNlcnNwYWNlIHRyaWVzIHRvIHVzZSBVU0IgaW50 ZXJmYWNlcyB3aXRoCj4gYkRldmljZUNsYXNzPTB4RkYsIGJEZXZpY2VTdWJDbGFzcz0weDQyLCBi RGV2aWNlUHJvdG9jb2w9MQo+IAo+IFByZXZlbnQgdGhlIG9wdGlvbiBkcml2ZXIgZnJvbSBiaW5k aW5nIHRvIHRob3NlIGludGVyZmFjZXMsIGFzIHRoZXkKPiB3aWxsIG5vdCBiZSBzZXJpYWwgcG9y dHMuCj4gCj4gVGhpcyBjYW4gZml4IGlzc3VlcyBsaWtlOgo+IGh0dHBzOi8vYnVncy5kZWJpYW4u b3JnL2NnaS1iaW4vYnVncmVwb3J0LmNnaT9idWc9NzgxMjU2Cj4gCj4gU2lnbmVkLW9mZi1ieTog Um9tYWluIEl6YXJkIDxyb21haW4uaXphcmQucHJvQGdtYWlsLmNvbT4KPiBDYzogc3RhYmxlIDxz dGFibGVAdmdlci5rZXJuZWwub3JnPgo+IC0tLQo+ICBkcml2ZXJzL3VzYi9zZXJpYWwvb3B0aW9u LmMgfCA2ICsrKysrKwo+ICAxIGZpbGUgY2hhbmdlZCwgNiBpbnNlcnRpb25zKCspCj4gCj4gZGlm ZiAtLWdpdCBhL2RyaXZlcnMvdXNiL3NlcmlhbC9vcHRpb24uYyBiL2RyaXZlcnMvdXNiL3Nlcmlh bC9vcHRpb24uYwo+IGluZGV4IDY2NGU2MWYxNmI2YS4uZjk4OTQzYTU3ZmYwIDEwMDY0NAo+IC0t LSBhL2RyaXZlcnMvdXNiL3NlcmlhbC9vcHRpb24uYwo+ICsrKyBiL2RyaXZlcnMvdXNiL3Nlcmlh bC9vcHRpb24uYwo+IEBAIC0xOTg3LDYgKzE5ODcsMTIgQEAgc3RhdGljIGludCBvcHRpb25fcHJv YmUoc3RydWN0IHVzYl9zZXJpYWwgKnNlcmlhbCwKPiAgCWlmIChpZmFjZV9kZXNjLT5iSW50ZXJm YWNlQ2xhc3MgPT0gVVNCX0NMQVNTX01BU1NfU1RPUkFHRSkKPiAgCQlyZXR1cm4gLUVOT0RFVjsK PiAgCj4gKwkvKiBEbyBub3QgYmluZCBBbmRyb2lkIERlYnVnIEJyaWRnZSBpbnRlcmZhY2VzICov Cj4gKwlpZiAoaWZhY2VfZGVzYy0+YkludGVyZmFjZUNsYXNzID09IFVTQl9DTEFTU19WRU5ET1Jf U1BFQyAmJgo+ICsJCWlmYWNlX2Rlc2MtPmJJbnRlcmZhY2VTdWJDbGFzcyA9PSAweDQyICYmCj4g KwkJaWZhY2VfZGVzYy0+YkludGVyZmFjZVByb3RvY29sID09IDEpCj4gKwkJcmV0dXJuIC1FTk9E RVY7CgpTaG91bGRuJ3QgeW91IGFsc28gY2hlY2sgdGhlIHZlbmRvci9wcm9kdWN0IGlkIGFzIHdl bGw/ICBPdGhlcndpc2UgdGhpcwpoYXMgdGhlIHBvdGVudGlhbCB0byBtYXRjaCByYW5kb20gZGV2 aWNlcyB0aGF0IGFyZSBub3QgcmVhbGx5IGFkYgpkZXZpY2VzLgoKdGhhbmtzLAoKZ3JlZyBrLWgK LS0tClRvIHVuc3Vic2NyaWJlIGZyb20gdGhpcyBsaXN0OiBzZW5kIHRoZSBsaW5lICJ1bnN1YnNj cmliZSBsaW51eC11c2IiIGluCnRoZSBib2R5IG9mIGEgbWVzc2FnZSB0byBtYWpvcmRvbW9Admdl ci5rZXJuZWwub3JnCk1vcmUgbWFqb3Jkb21vIGluZm8gYXQgIGh0dHA6Ly92Z2VyLmtlcm5lbC5v cmcvbWFqb3Jkb21vLWluZm8uaHRtbAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.3 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_PASS,USER_AGENT_MUTT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF881ECDE5F for ; Mon, 23 Jul 2018 14:08:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7511720881 for ; Mon, 23 Jul 2018 14:08:06 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7511720881 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388211AbeGWPJa (ORCPT ); Mon, 23 Jul 2018 11:09:30 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:59182 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2387999AbeGWPJ3 (ORCPT ); Mon, 23 Jul 2018 11:09:29 -0400 Received: from localhost (LFbn-1-12238-233.w90-92.abo.wanadoo.fr [90.92.53.233]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id BAAF841C; Mon, 23 Jul 2018 14:08:03 +0000 (UTC) Date: Mon, 23 Jul 2018 16:08:01 +0200 From: Greg Kroah-Hartman To: Romain Izard Cc: Johan Hovold , linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, stable Subject: Re: [PATCH] option: Do not try to bind to ADB interfaces Message-ID: <20180723140801.GA4835@kroah.com> References: <20180723140220.7166-1-romain.izard.pro@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20180723140220.7166-1-romain.izard.pro@gmail.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jul 23, 2018 at 04:02:20PM +0200, Romain Izard wrote: > Some modems now use the Android Debug Bridge to provide a debugging > interface, and some phones can also export serial ports managed by the > "option" driver. > > The ADB daemon running in userspace tries to use USB interfaces with > bDeviceClass=0xFF, bDeviceSubClass=0x42, bDeviceProtocol=1 > > Prevent the option driver from binding to those interfaces, as they > will not be serial ports. > > This can fix issues like: > https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=781256 > > Signed-off-by: Romain Izard > Cc: stable > --- > drivers/usb/serial/option.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c > index 664e61f16b6a..f98943a57ff0 100644 > --- a/drivers/usb/serial/option.c > +++ b/drivers/usb/serial/option.c > @@ -1987,6 +1987,12 @@ static int option_probe(struct usb_serial *serial, > if (iface_desc->bInterfaceClass == USB_CLASS_MASS_STORAGE) > return -ENODEV; > > + /* Do not bind Android Debug Bridge interfaces */ > + if (iface_desc->bInterfaceClass == USB_CLASS_VENDOR_SPEC && > + iface_desc->bInterfaceSubClass == 0x42 && > + iface_desc->bInterfaceProtocol == 1) > + return -ENODEV; Shouldn't you also check the vendor/product id as well? Otherwise this has the potential to match random devices that are not really adb devices. thanks, greg k-h