Skip to content

Commit 90bca37

Browse files
tiwaigregkh
authored andcommitted
ALSA: line6: Add a sanity check for invalid EPs
commit 2a4340c upstream. As syzkaller spotted, currently line6 drivers submit a URB with the fixed EP without checking whether it's actually available, which may result in a kernel warning like: usb 1-1: BOGUS urb xfer, pipe 3 != type 1 ------------[ cut here ]------------ WARNING: CPU: 0 PID: 24 at drivers/usb/core/urb.c:449 usb_submit_urb+0xf8a/0x11d0 Modules linked in: CPU: 0 PID: 24 Comm: kworker/0:1 Not tainted 4.14.0-rc2-42613-g1488251d1a98 #238 Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS Bochs 01/01/2011 Workqueue: usb_hub_wq hub_event Call Trace: line6_start_listen+0x55f/0x9e0 sound/usb/line6/driver.c:82 line6_init_cap_control sound/usb/line6/driver.c:690 line6_probe+0x7c9/0x1310 sound/usb/line6/driver.c:764 podhd_probe+0x64/0x70 sound/usb/line6/podhd.c:474 usb_probe_interface+0x35d/0x8e0 drivers/usb/core/driver.c:361 .... This patch adds a sanity check of validity of EPs at the device initialization phase for avoiding the call with an invalid EP. Reported-by: Andrey Konovalov <[email protected]> Tested-by: Andrey Konovalov <[email protected]> Signed-off-by: Takashi Iwai <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 8c666e6 commit 90bca37

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

sound/usb/line6/driver.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,13 @@ static int line6_start_listen(struct usb_line6 *line6)
7878
line6->buffer_listen, LINE6_BUFSIZE_LISTEN,
7979
line6_data_received, line6);
8080
}
81+
82+
/* sanity checks of EP before actually submitting */
83+
if (usb_urb_ep_type_check(line6->urb_listen)) {
84+
dev_err(line6->ifcdev, "invalid control EP\n");
85+
return -EINVAL;
86+
}
87+
8188
line6->urb_listen->actual_length = 0;
8289
err = usb_submit_urb(line6->urb_listen, GFP_ATOMIC);
8390
return err;

0 commit comments

Comments
 (0)