Skip to content

Commit f0d43d2

Browse files
pskrgaggregkh
authored andcommitted
Input: aiptek - properly check endpoint type
commit 5600f69 upstream. Syzbot reported warning in usb_submit_urb() which is caused by wrong endpoint type. There was a check for the number of endpoints, but not for the type of endpoint. Fix it by replacing old desc.bNumEndpoints check with usb_find_common_endpoints() helper for finding endpoints Fail log: usb 5-1: BOGUS urb xfer, pipe 1 != type 3 WARNING: CPU: 2 PID: 48 at drivers/usb/core/urb.c:502 usb_submit_urb+0xed2/0x18a0 drivers/usb/core/urb.c:502 Modules linked in: CPU: 2 PID: 48 Comm: kworker/2:2 Not tainted 5.17.0-rc6-syzkaller-00226-g07ebd38a0da2 #0 Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS 1.14.0-2 04/01/2014 Workqueue: usb_hub_wq hub_event ... Call Trace: <TASK> aiptek_open+0xd5/0x130 drivers/input/tablet/aiptek.c:830 input_open_device+0x1bb/0x320 drivers/input/input.c:629 kbd_connect+0xfe/0x160 drivers/tty/vt/keyboard.c:1593 Fixes: 8e20cf2 ("Input: aiptek - fix crash on detecting device without endpoints") Reported-and-tested-by: syzbot+75cccf2b7da87fb6f84b@syzkaller.appspotmail.com Signed-off-by: Pavel Skripkin <paskripkin@gmail.com> Link: https://lore.kernel.org/r/20220308194328.26220-1-paskripkin@gmail.com Signed-off-by: Dmitry Torokhov <dmitry.torokhov@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent 98e7a65 commit f0d43d2

1 file changed

Lines changed: 4 additions & 6 deletions

File tree

drivers/input/tablet/aiptek.c

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1801,15 +1801,13 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
18011801
input_set_abs_params(inputdev, ABS_TILT_Y, AIPTEK_TILT_MIN, AIPTEK_TILT_MAX, 0, 0);
18021802
input_set_abs_params(inputdev, ABS_WHEEL, AIPTEK_WHEEL_MIN, AIPTEK_WHEEL_MAX - 1, 0, 0);
18031803

1804-
/* Verify that a device really has an endpoint */
1805-
if (intf->cur_altsetting->desc.bNumEndpoints < 1) {
1804+
err = usb_find_common_endpoints(intf->cur_altsetting,
1805+
NULL, NULL, &endpoint, NULL);
1806+
if (err) {
18061807
dev_err(&intf->dev,
1807-
"interface has %d endpoints, but must have minimum 1\n",
1808-
intf->cur_altsetting->desc.bNumEndpoints);
1809-
err = -EINVAL;
1808+
"interface has no int in endpoints, but must have minimum 1\n");
18101809
goto fail3;
18111810
}
1812-
endpoint = &intf->cur_altsetting->endpoint[0].desc;
18131811

18141812
/* Go set up our URB, which is called when the tablet receives
18151813
* input.

0 commit comments

Comments
 (0)