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>,
Florian Echtler <floe@butterbrot.org>
Subject: [PATCH 7/7] Input: sur40: fix interface sanity checks
Date: Tue, 10 Dec 2019 12:37:37 +0100 [thread overview]
Message-ID: <20191210113737.4016-8-johan@kernel.org> (raw)
In-Reply-To: <20191210113737.4016-1-johan@kernel.org>
Make sure to use the current alternate setting when verifying the
interface descriptors to avoid 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: bdb5c57f209c ("Input: add sur40 driver for Samsung SUR40 (aka MS Surface 2.0/Pixelsense)")
Cc: stable <stable@vger.kernel.org> # 3.13
Cc: Florian Echtler <floe@butterbrot.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/input/touchscreen/sur40.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/drivers/input/touchscreen/sur40.c b/drivers/input/touchscreen/sur40.c
index 1dd47dda71cd..34d31c7ec8ba 100644
--- a/drivers/input/touchscreen/sur40.c
+++ b/drivers/input/touchscreen/sur40.c
@@ -661,7 +661,7 @@ static int sur40_probe(struct usb_interface *interface,
int error;
/* Check if we really have the right interface. */
- iface_desc = &interface->altsetting[0];
+ iface_desc = interface->cur_altsetting;
if (iface_desc->desc.bInterfaceClass != 0xFF)
return -ENODEV;
--
2.24.0
next prev 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 ` [PATCH 2/7] Input: aiptek: " Johan Hovold
2019-12-11 11:55 ` 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 ` Johan Hovold [this message]
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-8-johan@kernel.org \
--to=johan@kernel.org \
--cc=dmitry.torokhov@gmail.com \
--cc=floe@butterbrot.org \
--cc=linux-input@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=stable@vger.kernel.org \
/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).