From: Johan Hovold <johan@kernel.org>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Johan Hovold <johan@kernel.org>, stable <stable@vger.kernel.org>,
Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>,
David Vrabel <david.vrabel@csr.com>
Subject: [PATCH 5/6] uwb: hwa-rc: fix NULL-deref at probe
Date: Mon, 13 Mar 2017 13:47:52 +0100 [thread overview]
Message-ID: <20170313124753.28784-6-johan@kernel.org> (raw)
In-Reply-To: <20170313124753.28784-1-johan@kernel.org>
Make sure to check the number of endpoints to avoid dereferencing a
NULL-pointer should a malicious device lack endpoints.
Note that the dereference happens in the start callback which is called
during probe.
Fixes: de520b8bd552 ("uwb: add HWA radio controller driver")
Cc: stable <stable@vger.kernel.org> # 2.6.28
Cc: Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
Cc: David Vrabel <david.vrabel@csr.com>
Signed-off-by: Johan Hovold <johan@kernel.org>
---
drivers/uwb/hwa-rc.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/uwb/hwa-rc.c b/drivers/uwb/hwa-rc.c
index 0aa6c3c29d17..35a1e777b449 100644
--- a/drivers/uwb/hwa-rc.c
+++ b/drivers/uwb/hwa-rc.c
@@ -823,6 +823,9 @@ static int hwarc_probe(struct usb_interface *iface,
struct hwarc *hwarc;
struct device *dev = &iface->dev;
+ if (iface->cur_altsetting->desc.bNumEndpoints < 1)
+ return -ENODEV;
+
result = -ENOMEM;
uwb_rc = uwb_rc_alloc();
if (uwb_rc == NULL) {
--
2.12.0
next prev parent reply other threads:[~2017-03-13 12:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20170313124753.28784-1-johan@kernel.org>
2017-03-13 12:47 ` [PATCH 1/6] USB: idmouse: fix NULL-deref at probe Johan Hovold
2017-03-13 12:47 ` [PATCH 2/6] USB: lvtest: " Johan Hovold
2017-03-13 12:47 ` [PATCH 3/6] USB: uss720: " Johan Hovold
2017-03-13 12:47 ` [PATCH 4/6] USB: wusbcore: " Johan Hovold
2017-03-13 12:47 ` Johan Hovold [this message]
2017-03-13 12:47 ` [PATCH 6/6] uwb: i1480-dfu: " 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=20170313124753.28784-6-johan@kernel.org \
--to=johan@kernel.org \
--cc=david.vrabel@csr.com \
--cc=gregkh@linuxfoundation.org \
--cc=inaky.perez-gonzalez@intel.com \
--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).