lkml.org 
[lkml]   [2016]   [Aug]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 29/68] Input: xpad - validate USB endpoint count during probe
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

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

    From: Cameron Gutman <aicommander@gmail.com>

    commit caca925fca4fb30c67be88cacbe908eec6721e43 upstream.

    This prevents a malicious USB device from causing an oops.

    Signed-off-by: Cameron Gutman <aicommander@gmail.com>
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/input/joystick/xpad.c | 3 +++
    1 file changed, 3 insertions(+)

    --- a/drivers/input/joystick/xpad.c
    +++ b/drivers/input/joystick/xpad.c
    @@ -1200,6 +1200,9 @@ static int xpad_probe(struct usb_interfa
    int ep_irq_in_idx;
    int i, error;

    + if (intf->cur_altsetting->desc.bNumEndpoints != 2)
    + return -ENODEV;
    +
    for (i = 0; xpad_device[i].idVendor; i++) {
    if ((le16_to_cpu(udev->descriptor.idVendor) == xpad_device[i].idVendor) &&
    (le16_to_cpu(udev->descriptor.idProduct) == xpad_device[i].idProduct))

    \
     
     \ /
      Last update: 2016-08-08 22:21    [W:3.146 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site