lkml.org 
[lkml]   [2019]   [Aug]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 4.4 14/28] Input: kbtab - sanity check for endpoint type
    Date
    From: Oliver Neukum <oneukum@suse.com>

    [ Upstream commit c88090dfc84254fa149174eb3e6a8458de1912c4 ]

    The driver should check whether the endpoint it uses has the correct
    type.

    Reported-by: syzbot+c7df50363aaff50aa363@syzkaller.appspotmail.com
    Signed-off-by: Oliver Neukum <oneukum@suse.com>
    Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    drivers/input/tablet/kbtab.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/drivers/input/tablet/kbtab.c b/drivers/input/tablet/kbtab.c
    index 2812f9236b7d0..0ccc120a0f145 100644
    --- a/drivers/input/tablet/kbtab.c
    +++ b/drivers/input/tablet/kbtab.c
    @@ -125,6 +125,10 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
    if (intf->cur_altsetting->desc.bNumEndpoints < 1)
    return -ENODEV;

    + endpoint = &intf->cur_altsetting->endpoint[0].desc;
    + if (!usb_endpoint_is_int_in(endpoint))
    + return -ENODEV;
    +
    kbtab = kzalloc(sizeof(struct kbtab), GFP_KERNEL);
    input_dev = input_allocate_device();
    if (!kbtab || !input_dev)
    @@ -164,8 +168,6 @@ static int kbtab_probe(struct usb_interface *intf, const struct usb_device_id *i
    input_set_abs_params(input_dev, ABS_Y, 0, 0x1750, 4, 0);
    input_set_abs_params(input_dev, ABS_PRESSURE, 0, 0xff, 0, 0);

    - endpoint = &intf->cur_altsetting->endpoint[0].desc;
    -
    usb_fill_int_urb(kbtab->irq, dev,
    usb_rcvintpipe(dev, endpoint->bEndpointAddress),
    kbtab->data, 8,
    --
    2.20.1
    \
     
     \ /
      Last update: 2019-08-14 04:30    [W:2.468 / U:0.288 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site