From: Johan Hovold <johan@kernel.org>
To: linux-usb@vger.kernel.org
Cc: Manivannan Sadhasivam <mani@kernel.org>,
linux-kernel@vger.kernel.org, Johan Hovold <johan@kernel.org>
Subject: [PATCH 01/10] USB: serial: xr: fix NULL-deref at probe
Date: Thu, 21 Jan 2021 11:29:13 +0100 [thread overview]
Message-ID: <20210121102922.17439-3-johan@kernel.org> (raw)
In-Reply-To: <20210121102922.17439-1-johan@kernel.org>
Make sure that the probed device has an interface 0 to avoid
dereferencing a NULL pointer in case of a malicious device or during
USB-descriptor fuzzing.
Fixes: a8f54b7bd132 ("USB: serial: add MaxLinear/Exar USB to Serial driver")
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/usb/serial/xr_serial.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/usb/serial/xr_serial.c b/drivers/usb/serial/xr_serial.c
index bdb2df27b50b..7be6da6a5cf3 100644
--- a/drivers/usb/serial/xr_serial.c
+++ b/drivers/usb/serial/xr_serial.c
@@ -552,6 +552,9 @@ static int xr_probe(struct usb_serial *serial, const struct usb_device_id *id)
/* But claim the control interface during data interface probe */
control_interface = usb_ifnum_to_if(usb_dev, 0);
+ if (!control_interface)
+ return -ENODEV;
+
ret = usb_driver_claim_interface(driver, control_interface, NULL);
if (ret) {
dev_err(&serial->interface->dev, "Failed to claim control interface\n");
--
2.26.2
next prev parent reply other threads:[~2021-01-21 10:37 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-21 10:29 [PATCH 00/10] USB: serial: xr: fix up remaining issues in new driver Johan Hovold
2021-01-21 10:29 ` [PATCH] USB: serial: cp210x: suppress modem-control error on open and close Johan Hovold
2021-01-21 10:32 ` Johan Hovold
2021-01-21 10:29 ` Johan Hovold [this message]
2021-01-21 10:29 ` [PATCH 02/10] USB: serial: xr: fix interface leak at disconnect Johan Hovold
2021-01-21 10:29 ` [PATCH 03/10] USB: serial: xr: use subsystem usb_device at probe Johan Hovold
2021-01-21 10:29 ` [PATCH 04/10] USB: serial: xr: use termios flag helpers Johan Hovold
2021-01-21 10:29 ` [PATCH 05/10] USB: serial: xr: document vendor-request recipient Johan Hovold
2021-01-21 10:29 ` [PATCH 06/10] USB: serial: xr: clean up line-settings handling Johan Hovold
2021-01-21 10:29 ` [PATCH 07/10] USB: serial: xr: simplify line-speed logic Johan Hovold
2021-01-21 10:29 ` [PATCH 08/10] USB: serial: xr: fix gpio-mode handling Johan Hovold
2021-01-21 10:29 ` [PATCH 09/10] USB: serial: xr: fix pin configuration Johan Hovold
2021-01-21 10:29 ` [PATCH 10/10] USB: serial: xr: fix B0 handling Johan Hovold
2021-01-26 15:26 ` [PATCH 00/10] USB: serial: xr: fix up remaining issues in new driver Johan Hovold
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=20210121102922.17439-3-johan@kernel.org \
--to=johan@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mani@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).