From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Romain Izard <romain.izard.pro@gmail.com>
Cc: Johan Hovold <johan@kernel.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
stable <stable@vger.kernel.org>
Subject: option: Do not try to bind to ADB interfaces
Date: Mon, 23 Jul 2018 16:08:01 +0200 [thread overview]
Message-ID: <20180723140801.GA4835@kroah.com> (raw)
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 <romain.izard.pro@gmail.com>
> Cc: stable <stable@vger.kernel.org>
> ---
> 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
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
WARNING: multiple messages have this Message-ID (diff)
From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: Romain Izard <romain.izard.pro@gmail.com>
Cc: Johan Hovold <johan@kernel.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
stable <stable@vger.kernel.org>
Subject: Re: [PATCH] option: Do not try to bind to ADB interfaces
Date: Mon, 23 Jul 2018 16:08:01 +0200 [thread overview]
Message-ID: <20180723140801.GA4835@kroah.com> (raw)
In-Reply-To: <20180723140220.7166-1-romain.izard.pro@gmail.com>
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 <romain.izard.pro@gmail.com>
> Cc: stable <stable@vger.kernel.org>
> ---
> 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
next reply other threads:[~2018-07-23 14:08 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-23 14:08 Greg Kroah-Hartman [this message]
2018-07-23 14:08 ` [PATCH] option: Do not try to bind to ADB interfaces Greg Kroah-Hartman
-- strict thread matches above, loose matches on Subject: below --
2018-08-29 7:56 Johan Hovold
2018-08-29 7:56 ` [PATCH] " Johan Hovold
2018-08-29 7:56 ` Johan Hovold
2018-08-27 16:15 Bjørn Mork
2018-08-27 16:15 ` [PATCH] " Bjørn Mork
2018-08-27 13:28 Johan Hovold
2018-08-27 13:28 ` [PATCH] " Johan Hovold
2018-08-27 13:28 ` Johan Hovold
2018-07-23 16:45 Romain Izard
2018-07-23 16:45 ` [PATCH] " Romain Izard
2018-07-23 16:37 Romain Izard
2018-07-23 16:37 ` [PATCH] " Romain Izard
2018-07-23 15:15 Lars Melin
2018-07-23 15:15 ` [PATCH] " Lars Melin
2018-07-23 14:02 Romain Izard
2018-07-23 14:02 ` [PATCH] " Romain Izard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180723140801.GA4835@kroah.com \
--to=gregkh@linuxfoundation.org \
--cc=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=romain.izard.pro@gmail.com \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.