lkml.org 
[lkml]   [2017]   [Sep]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] uwb: ensure that endpoint is interrupt
    Date
    hwarc_neep_init() assumes that endpoint 0 is interrupt, but there's no
    check for that, which results in a WARNING in USB core code, when a bad
    USB descriptor is provided from a device:

    usb 1-1: BOGUS urb xfer, pipe 1 != type 3
    ------------[ cut here ]------------
    WARNING: CPU: 0 PID: 3 at drivers/usb/core/urb.c:449 usb_submit_urb+0xf8a/0x11d0
    Modules linked in:
    CPU: 0 PID: 3 Comm: kworker/0:0 Not tainted 4.13.0+ #111
    Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011
    Workqueue: usb_hub_wq hub_event
    task: ffff88006bdc1a00 task.stack: ffff88006bde8000
    RIP: 0010:usb_submit_urb+0xf8a/0x11d0 drivers/usb/core/urb.c:448
    RSP: 0018:ffff88006bdee3c0 EFLAGS: 00010282
    RAX: 0000000000000029 RBX: ffff8800672a7200 RCX: 0000000000000000
    RDX: 0000000000000029 RSI: ffff88006c815c78 RDI: ffffed000d7bdc6a
    RBP: ffff88006bdee4c0 R08: fffffbfff0fe00ff R09: fffffbfff0fe00ff
    R10: 0000000000000018 R11: fffffbfff0fe00fe R12: 1ffff1000d7bdc7f
    R13: 0000000000000003 R14: 0000000000000001 R15: ffff88006b02cc90
    FS: 0000000000000000(0000) GS:ffff88006c800000(0000) knlGS:0000000000000000
    CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033
    CR2: 00007fe4daddf000 CR3: 000000006add6000 CR4: 00000000000006f0
    Call Trace:
    hwarc_neep_init+0x4ce/0x9c0 drivers/uwb/hwa-rc.c:710
    uwb_rc_add+0x2fb/0x730 drivers/uwb/lc-rc.c:361
    hwarc_probe+0x34e/0x9b0 drivers/uwb/hwa-rc.c:858
    usb_probe_interface+0x351/0x8d0 drivers/usb/core/driver.c:361
    really_probe drivers/base/dd.c:385
    driver_probe_device+0x610/0xa00 drivers/base/dd.c:529
    __device_attach_driver+0x230/0x290 drivers/base/dd.c:625
    bus_for_each_drv+0x15e/0x210 drivers/base/bus.c:463
    __device_attach+0x269/0x3c0 drivers/base/dd.c:682
    device_initial_probe+0x1f/0x30 drivers/base/dd.c:729
    bus_probe_device+0x1da/0x280 drivers/base/bus.c:523
    device_add+0xcf9/0x1640 drivers/base/core.c:1703
    usb_set_configuration+0x1064/0x1890 drivers/usb/core/message.c:1932
    generic_probe+0x73/0xe0 drivers/usb/core/generic.c:174
    usb_probe_device+0xaf/0xe0 drivers/usb/core/driver.c:266
    really_probe drivers/base/dd.c:385
    driver_probe_device+0x610/0xa00 drivers/base/dd.c:529
    __device_attach_driver+0x230/0x290 drivers/base/dd.c:625
    bus_for_each_drv+0x15e/0x210 drivers/base/bus.c:463
    __device_attach+0x269/0x3c0 drivers/base/dd.c:682
    device_initial_probe+0x1f/0x30 drivers/base/dd.c:729
    bus_probe_device+0x1da/0x280 drivers/base/bus.c:523
    device_add+0xcf9/0x1640 drivers/base/core.c:1703
    usb_new_device+0x7b8/0x1020 drivers/usb/core/hub.c:2457
    hub_port_connect drivers/usb/core/hub.c:4890
    hub_port_connect_change drivers/usb/core/hub.c:4996
    port_event drivers/usb/core/hub.c:5102
    hub_event+0x23c8/0x37c0 drivers/usb/core/hub.c:5182
    process_one_work+0x9fb/0x1570 kernel/workqueue.c:2097
    worker_thread+0x1e4/0x1350 kernel/workqueue.c:2231
    kthread+0x324/0x3f0 kernel/kthread.c:231
    ret_from_fork+0x25/0x30 arch/x86/entry/entry_64.S:425
    Code: 48 8b 85 30 ff ff ff 48 8d b8 98 00 00 00 e8 8e 93 07 ff 45 89
    e8 44 89 f1 4c 89 fa 48 89 c6 48 c7 c7 a0 e5 55 86 e8 20 08 8f fd <0f>
    ff e9 9b f7 ff ff e8 4a 04 d6 fd e9 80 f7 ff ff e8 60 11 a6
    ---[ end trace 55d741234124cfc3 ]---

    Check that endpoint is interrupt.

    Found by syzkaller.

    Signed-off-by: Andrey Konovalov <andreyknvl@google.com>
    ---
    drivers/uwb/hwa-rc.c | 2 ++
    1 file changed, 2 insertions(+)

    diff --git a/drivers/uwb/hwa-rc.c b/drivers/uwb/hwa-rc.c
    index 35a1e777b449..9a53912bdfe9 100644
    --- a/drivers/uwb/hwa-rc.c
    +++ b/drivers/uwb/hwa-rc.c
    @@ -825,6 +825,8 @@ static int hwarc_probe(struct usb_interface *iface,

    if (iface->cur_altsetting->desc.bNumEndpoints < 1)
    return -ENODEV;
    + if (!usb_endpoint_xfer_int(&iface->cur_altsetting->endpoint[0].desc))
    + return -ENODEV;

    result = -ENOMEM;
    uwb_rc = uwb_rc_alloc();
    --
    2.14.1.690.gbb1197296e-goog
    \
     
     \ /
      Last update: 2017-09-14 19:29    [W:5.291 / U:0.032 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site