lkml.org 
[lkml]   [2019]   [Mar]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[BACKPORT 4.4.y 04/25] USB: iowarrior: fix oops with malicious USB descriptors
    Date
    From: Josh Boyer <jwboyer@fedoraproject.org>

    The iowarrior driver expects at least one valid endpoint. If given
    malicious descriptors that specify 0 for the number of endpoints,
    it will crash in the probe function. Ensure there is at least
    one endpoint on the interface before using it.

    The full report of this issue can be found here:
    http://seclists.org/bugtraq/2016/Mar/87

    Reported-by: Ralf Spenneberg <ralf@spenneberg.net>
    Cc: stable <stable@vger.kernel.org>
    Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    (cherry picked from commit 4ec0ef3a82125efc36173062a50624550a900ae0)
    Signed-off-by: Arnd Bergmann <arnd@arndb.de>
    ---
    drivers/usb/misc/iowarrior.c | 6 ++++++
    1 file changed, 6 insertions(+)

    diff --git a/drivers/usb/misc/iowarrior.c b/drivers/usb/misc/iowarrior.c
    index 5e43fd881a9c..381a92a0ebb6 100644
    --- a/drivers/usb/misc/iowarrior.c
    +++ b/drivers/usb/misc/iowarrior.c
    @@ -787,6 +787,12 @@ static int iowarrior_probe(struct usb_interface *interface,
    iface_desc = interface->cur_altsetting;
    dev->product_id = le16_to_cpu(udev->descriptor.idProduct);

    + if (iface_desc->desc.bNumEndpoints < 1) {
    + dev_err(&interface->dev, "Invalid number of endpoints\n");
    + retval = -EINVAL;
    + goto error;
    + }
    +
    /* set up the endpoint information */
    for (i = 0; i < iface_desc->desc.bNumEndpoints; ++i) {
    endpoint = &iface_desc->endpoint[i].desc;
    --
    2.20.0
    \
     
     \ /
      Last update: 2019-03-22 16:46    [W:4.141 / U:0.724 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site