lkml.org 
[lkml]   [2017]   [Sep]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 033/106] watchdog: pcwd_usb: fix NULL-deref at probe
    3.2.93-rc1 review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Johan Hovold <johan@kernel.org>

    commit 46c319b848268dab3f0e7c4a5b6e9146d3bca8a4 upstream.

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

    Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Reviewed-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Guenter Roeck <linux@roeck-us.net>
    Signed-off-by: Wim Van Sebroeck <wim@iguana.be>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/watchdog/pcwd_usb.c | 3 +++
    1 file changed, 3 insertions(+)

    --- a/drivers/watchdog/pcwd_usb.c
    +++ b/drivers/watchdog/pcwd_usb.c
    @@ -641,6 +641,9 @@ static int usb_pcwd_probe(struct usb_int
    return -ENODEV;
    }

    + if (iface_desc->desc.bNumEndpoints < 1)
    + return -ENODEV;
    +
    /* check out the endpoint: it has to be Interrupt & IN */
    endpoint = &iface_desc->endpoint[0].desc;

    \
     
     \ /
      Last update: 2017-09-10 00:39    [W:9.400 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site