[PATCH 3.2 12/67] USB: visor: fix null-deref at probe

From	Ben Hutchings <ben@decadent.org.uk>
Newsgroups	linux.kernel
Subject	[PATCH 3.2 12/67] USB: visor: fix null-deref at probe
Date	2016-02-23 23:10 +0100
Message-ID	<r5tjA-3kK-13@gated-at.bofh.it> (permalink)
References	<r5t0e-2Ub-3@gated-at.bofh.it>
Organization	linux.* mail to news gateway

Show all headers | View raw

3.2.78-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Johan Hovold <johan@kernel.org>

commit cac9b50b0d75a1d50d6c056ff65c005f3224c8e0 upstream.

Fix null-pointer dereference at probe should a (malicious) Treo device
lack the expected endpoints.

Specifically, the Treo port-setup hack was dereferencing the bulk-in and
interrupt-in urbs without first making sure they had been allocated by
core.

Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 drivers/usb/serial/visor.c | 5 +++++
 1 file changed, 5 insertions(+)

--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -587,6 +587,11 @@ static int treo_attach(struct usb_serial
 
 	dbg("%s", __func__);
 
+	if (serial->num_bulk_in < 2 || serial->num_interrupt_in < 2) {
+		dev_err(&serial->interface->dev, "missing endpoints\n");
+		return -ENODEV;
+	}
+
 	/*
 	* It appears that Treos and Kyoceras want to use the
 	* 1st bulk in endpoint to communicate with the 2nd bulk out endpoint,

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

[PATCH 3.2 12/67] USB: visor: fix null-deref at probe Ben Hutchings <ben@decadent.org.uk> - 2016-02-23 23:10 +0100

csiph-web