linux-usb.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johan Hovold <johan@kernel.org>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: linux-input@vger.kernel.org, linux-usb@vger.kernel.org,
	linux-kernel@vger.kernel.org, Johan Hovold <johan@kernel.org>,
	stable <stable@vger.kernel.org>,
	Vladis Dronov <vdronov@redhat.com>
Subject: [PATCH 2/7] Input: aiptek: fix endpoint sanity check
Date: Tue, 10 Dec 2019 12:37:32 +0100	[thread overview]
Message-ID: <20191210113737.4016-3-johan@kernel.org> (raw)
In-Reply-To: <20191210113737.4016-1-johan@kernel.org>

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: 8e20cf2bce12 ("Input: aiptek - fix crash on detecting device without endpoints")
Cc: stable <stable@vger.kernel.org>     # 4.4
Cc: Vladis Dronov <vdronov@redhat.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
 drivers/input/tablet/aiptek.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/input/tablet/aiptek.c b/drivers/input/tablet/aiptek.c
index 2ca586fb914f..06d0ffef4a17 100644
--- a/drivers/input/tablet/aiptek.c
+++ b/drivers/input/tablet/aiptek.c
@@ -1802,14 +1802,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);
 
 	/* 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,
 			"interface has %d endpoints, but must have minimum 1\n",
-			intf->altsetting[0].desc.bNumEndpoints);
+			intf->cur_altsetting->desc.bNumEndpoints);
 		err = -EINVAL;
 		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
 	 * input.
-- 
2.24.0


  parent reply	other threads:[~2019-12-10 11:38 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-12-10 11:37 [PATCH 0/7] Input: fix USB alsetting bugs Johan Hovold
2019-12-10 11:37 ` [PATCH 1/7] Input: pegasus_notetaker: fix endpoint sanity check Johan Hovold
2019-12-10 11:51   ` Martin Kepplinger
2020-02-04  8:24   ` Johan Hovold
2020-02-04 10:02     ` Greg KH
2020-02-04 10:14       ` Johan Hovold
2020-02-04 19:24         ` Dmitry Torokhov
2020-02-05 12:54           ` Johan Hovold
2019-12-10 11:37 ` Johan Hovold [this message]
2019-12-11 11:55   ` [PATCH 2/7] Input: aiptek: " Vladis Dronov
2019-12-10 11:37 ` [PATCH 3/7] Input: aiptek: use descriptors of current altsetting Johan Hovold
2019-12-10 11:37 ` [PATCH 4/7] Input: gtco: fix endpoint sanity check Johan Hovold
2019-12-11 11:59   ` Vladis Dronov
2019-12-10 11:37 ` [PATCH 5/7] Input: gtco: fix extra-descriptor debug message Johan Hovold
2019-12-10 11:37 ` [PATCH 6/7] Input: gtco: drop redundant variable reinit Johan Hovold
2019-12-10 11:37 ` [PATCH 7/7] Input: sur40: fix interface sanity checks Johan Hovold
2019-12-12 15:25 ` [PATCH 0/7] Input: fix USB alsetting bugs Vladis Dronov
2020-01-10 22:43   ` Dmitry Torokhov

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20191210113737.4016-3-johan@kernel.org \
    --to=johan@kernel.org \
    --cc=dmitry.torokhov@gmail.com \
    --cc=linux-input@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    --cc=vdronov@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).