Commit a8eeb74d authored by Johan Hovold's avatar Johan Hovold Committed by Dmitry Torokhov

Input: gtco - fix endpoint sanity check

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: 162f98de ("Input: gtco - 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-5-johan@kernel.orgSigned-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
parent cfa4f6a9
...@@ -875,18 +875,14 @@ static int gtco_probe(struct usb_interface *usbinterface, ...@@ -875,18 +875,14 @@ static int gtco_probe(struct usb_interface *usbinterface,
} }
/* Sanity check that a device has an endpoint */ /* Sanity check that a device has an endpoint */
if (usbinterface->altsetting[0].desc.bNumEndpoints < 1) { if (usbinterface->cur_altsetting->desc.bNumEndpoints < 1) {
dev_err(&usbinterface->dev, dev_err(&usbinterface->dev,
"Invalid number of endpoints\n"); "Invalid number of endpoints\n");
error = -EINVAL; error = -EINVAL;
goto err_free_urb; goto err_free_urb;
} }
/* endpoint = &usbinterface->cur_altsetting->endpoint[0].desc;
* The endpoint is always altsetting 0, we know this since we know
* this device only has one interrupt endpoint
*/
endpoint = &usbinterface->altsetting[0].endpoint[0].desc;
/* Some debug */ /* Some debug */
dev_dbg(&usbinterface->dev, "gtco # interfaces: %d\n", usbinterface->num_altsetting); dev_dbg(&usbinterface->dev, "gtco # interfaces: %d\n", usbinterface->num_altsetting);
...@@ -973,7 +969,7 @@ static int gtco_probe(struct usb_interface *usbinterface, ...@@ -973,7 +969,7 @@ static int gtco_probe(struct usb_interface *usbinterface,
input_dev->dev.parent = &usbinterface->dev; input_dev->dev.parent = &usbinterface->dev;
/* Setup the URB, it will be posted later on open of input device */ /* Setup the URB, it will be posted later on open of input device */
endpoint = &usbinterface->altsetting[0].endpoint[0].desc; endpoint = &usbinterface->cur_altsetting->endpoint[0].desc;
usb_fill_int_urb(gtco->urbinfo, usb_fill_int_urb(gtco->urbinfo,
udev, udev,
......
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