lkml.org 
[lkml]   [2017]   [Apr]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.12 089/142] uwb: i1480-dfu: fix NULL-deref at probe
    Date
    From: Johan Hovold <johan@kernel.org>

    3.12-stable review patch. If anyone has any objections, please let me know.

    ===============

    commit 4ce362711d78a4999011add3115b8f4b0bc25e8c upstream.

    Make sure to check the number of endpoints to avoid dereferencing a
    NULL-pointer should a malicious device lack endpoints.

    Note that the dereference happens in the cmd and wait_init_done
    callbacks which are called during probe.

    Fixes: 1ba47da52712 ("uwb: add the i1480 DFU driver")
    Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
    Cc: David Vrabel <david.vrabel@csr.com>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    ---
    drivers/uwb/i1480/dfu/usb.c | 3 +++
    1 file changed, 3 insertions(+)

    diff --git a/drivers/uwb/i1480/dfu/usb.c b/drivers/uwb/i1480/dfu/usb.c
    index 2bfc846ac071..6345e85822a4 100644
    --- a/drivers/uwb/i1480/dfu/usb.c
    +++ b/drivers/uwb/i1480/dfu/usb.c
    @@ -362,6 +362,9 @@ int i1480_usb_probe(struct usb_interface *iface, const struct usb_device_id *id)
    result);
    }

    + if (iface->cur_altsetting->desc.bNumEndpoints < 1)
    + return -ENODEV;
    +
    result = -ENOMEM;
    i1480_usb = kzalloc(sizeof(*i1480_usb), GFP_KERNEL);
    if (i1480_usb == NULL) {
    --
    2.12.2
    \
     
     \ /
      Last update: 2017-04-10 17:35    [W:4.048 / U:0.332 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site