Commit 9a0729d1 authored by Johan Hovold's avatar Johan Hovold Committed by Kleber Sacilotto de Souza

Input: aiptek - fix endpoint sanity check

BugLink: https://bugs.launchpad.net/bugs/1864773

commit 3111491f upstream.

The driver was checking the number of endpoints of the first alternate
setting instead of the current one, something which could lead to the
driver binding to an invalid interface.

This in turn could cause the driver to misbehave or trigger a WARN() in
usb_submit_urb() that kernels with panic_on_warn set would choke on.

Fixes: 8e20cf2b ("Input: aiptek - fix crash on detecting device without endpoints")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Acked-by: default avatarVladis Dronov <vdronov@redhat.com>
Link: https://lore.kernel.org/r/20191210113737.4016-3-johan@kernel.orgSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarKhalid Elmously <khalid.elmously@canonical.com>
Signed-off-by: default avatarKleber Sacilotto de Souza <kleber.souza@canonical.com>
parent 522788ab
...@@ -1820,14 +1820,14 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id) ...@@ -1820,14 +1820,14 @@ aiptek_probe(struct usb_interface *intf, const struct usb_device_id *id)
input_set_abs_params(inputdev, ABS_WHEEL, AIPTEK_WHEEL_MIN, AIPTEK_WHEEL_MAX - 1, 0, 0); input_set_abs_params(inputdev, ABS_WHEEL, AIPTEK_WHEEL_MIN, AIPTEK_WHEEL_MAX - 1, 0, 0);
/* Verify that a device really has an endpoint */ /* Verify that a device really has an endpoint */
if (intf->altsetting[0].desc.bNumEndpoints < 1) { if (intf->cur_altsetting->desc.bNumEndpoints < 1) {
dev_err(&intf->dev, dev_err(&intf->dev,
"interface has %d endpoints, but must have minimum 1\n", "interface has %d endpoints, but must have minimum 1\n",
intf->altsetting[0].desc.bNumEndpoints); intf->cur_altsetting->desc.bNumEndpoints);
err = -EINVAL; err = -EINVAL;
goto fail3; goto fail3;
} }
endpoint = &intf->altsetting[0].endpoint[0].desc; endpoint = &intf->cur_altsetting->endpoint[0].desc;
/* Go set up our URB, which is called when the tablet receives /* Go set up our URB, which is called when the tablet receives
* input. * input.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment