All of lore.kernel.org
 help / color / mirror / Atom feed
From: Sergei Shtylyov <sergei.shtylyov@cogentembedded.com>
To: Quentin Casasnovas <quentin.casasnovas@oracle.com>,
	lkml <linux-kernel@vger.kernel.org>
Cc: linux-usb <linux-usb@vger.kernel.org>,
	Phil Turnbull <phil.turnbull@oracle.com>,
	Oliver Neukum <oneukum@suse.de>, Adam Lee <adam8157@gmail.com>
Subject: Re: [PATCH] cdc-acm: prevent infinite loop when parsing CDC headers.
Date: Tue, 14 Apr 2015 14:01:57 +0300	[thread overview]
Message-ID: <552CF3A5.7040202@cogentembedded.com> (raw)
In-Reply-To: <552BECD6.9090406@cogentembedded.com>

Hello.

On 4/13/2015 7:20 PM, Sergei Shtylyov wrote:

>> Phil and I found out a problem with commit:

>>    7e860a6e ("cdc-acm: add sanity checks")

>> It added some sanity checks to ignore potential garbage in CDC headers but
>> also introduced a potential infinite loop.  This can happen at the first
>> loop iteration (elength = 0 in that case) if the description isn't a
>> DT_CS_INTERFACE or later if 'buffer[0]' is zero.
>
>> It should also be noted that the wrong length was being added to 'buffer'
>> in case 'buffer[1]' was not a DT_CS_INTERFACE descriptor, since elength was
>> assigned after that check in the loop.

>> A specially crafted USB device could be used to trigger this infinite loop.

>> Fixes: 7e860a6e ("cdc-acm: add sanity checks")

>     12-digit SHA1 hash is required here.

>> Signed-off-by: Phil Turnbull <phil.turnbull@oracle.com>
>> Signed-off-by: Quentin Casasnovas <quentin.casasnovas@oracle.com>
>> CC: Oliver Neukum <oneukum@suse.de>
>> CC: Adam Lee <adam8157@gmail.com>
>> ---
>>   drivers/usb/class/cdc-acm.c | 3 ++-
>>   1 file changed, 2 insertions(+), 1 deletion(-)

>> diff --git a/drivers/usb/class/cdc-acm.c b/drivers/usb/class/cdc-acm.c
>> index 6836177..1ac4587 100644
>> --- a/drivers/usb/class/cdc-acm.c
>> +++ b/drivers/usb/class/cdc-acm.c
>> @@ -1133,11 +1133,12 @@ static int acm_probe(struct usb_interface *intf,
>>       }
>>
>>       while (buflen > 0) {
>> +        if ((elength = buffer[0]) == 0)

>     Please run your patches thru scripts/checkpatch.pl. Assignments in the
> *if* operator are not allowed.

    s/operator/statement/, of course. :-)

> [...]

WBR, Sergei


  reply	other threads:[~2015-04-14 11:02 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-04-13 15:24 [PATCH] cdc-acm: prevent infinite loop when parsing CDC headers Quentin Casasnovas
2015-04-13 15:48 ` Adam Lee
2015-04-13 16:02   ` Quentin Casasnovas
2015-04-13 15:53 ` Quentin Casasnovas
2015-04-13 16:20 ` Sergei Shtylyov
2015-04-14 11:01   ` Sergei Shtylyov [this message]
2015-04-14  9:25 ` [PATCH v2] " Quentin Casasnovas
2015-04-20 11:54   ` Quentin Casasnovas
2015-04-20 14:27     ` Greg Kroah-Hartman

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=552CF3A5.7040202@cogentembedded.com \
    --to=sergei.shtylyov@cogentembedded.com \
    --cc=adam8157@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=oneukum@suse.de \
    --cc=phil.turnbull@oracle.com \
    --cc=quentin.casasnovas@oracle.com \
    /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.