public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
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 6/6] uwb: i1480-dfu: fix NULL-deref at probe
Date: Mon, 13 Mar 2017 13:47:53 +0100	[thread overview]
Message-ID: <20170313124753.28784-7-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 cmd and wait_init_done
callbacks which are called during probe.

Fixes: 1ba47da52712 ("uwb: add the i1480 DFU 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/i1480/dfu/usb.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/uwb/i1480/dfu/usb.c b/drivers/uwb/i1480/dfu/usb.c
index 2bfc846ac071..6345e85822a4 100644
--- a/drivers/uwb/i1480/dfu/usb.c
+++ b/drivers/uwb/i1480/dfu/usb.c
@@ -362,6 +362,9 @@ int i1480_usb_probe(struct usb_interface *iface, const struct usb_device_id *id)
 				 result);
 	}
 
+	if (iface->cur_altsetting->desc.bNumEndpoints < 1)
+		return -ENODEV;
+
 	result = -ENOMEM;
 	i1480_usb = kzalloc(sizeof(*i1480_usb), GFP_KERNEL);
 	if (i1480_usb == NULL) {
-- 
2.12.0

      parent reply	other threads:[~2017-03-13 12:49 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-13 12:47 [PATCH 0/6] USB: fix missing endpoint sanity checks Johan Hovold
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 ` [PATCH 5/6] uwb: hwa-rc: " Johan Hovold
2017-03-13 12:47 ` Johan Hovold [this message]

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