Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0236383f authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

Input: gtco - fix endpoint sanity check 



commit a8eeb74df5a6bdb214b2b581b14782c5f5a0cf83 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: 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.org


Signed-off-by: default avatarDmitry Torokhov <dmitry.torokhov@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 364ff528

drivers/input/tablet/gtco.c

+3 −7
Original line number Diff line number Diff line
@@ -875,18 +875,14 @@ static int gtco_probe(struct usb_interface *usbinterface, 
	}



	/* 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,

			"Invalid number of endpoints\n");

		error = -EINVAL;

		goto err_free_urb;

	}



	/*

	 * 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;

	endpoint = &usbinterface->cur_altsetting->endpoint[0].desc;



	/* Some debug */

	dev_dbg(&usbinterface->dev, "gtco # interfaces: %d\n", usbinterface->num_altsetting);
@@ -973,7 +969,7 @@ static int gtco_probe(struct usb_interface *usbinterface, 
	input_dev->dev.parent = &usbinterface->dev;



	/* 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,

			 udev,