[PATCH 2.6.32 01/55] usb: serial: visor: fix crash on detecting device without write_urbs

Path	csiph.com!aioe.org!bofh.it!news.nic.it!robomod
From	Willy Tarreau <w@1wt.eu>
Newsgroups	linux.kernel
Subject	[PATCH 2.6.32 01/55] usb: serial: visor: fix crash on detecting device without write_urbs
Date	Fri, 04 Mar 2016 17:20:01 +0100
Message-ID	<r90Cl-R6-7@gated-at.bofh.it> (permalink)
References	<r90sF-Ls-3@gated-at.bofh.it>
X-Original-To	linux-kernel@vger.kernel.org, stable@vger.kernel.org
User-Agent	quilt/0.63-1
MIME-Version	1.0
Content-Type	text/plain; charset=ISO-8859-15
Sender	robomod@news.nic.it
List-ID	<linux-kernel.vger.kernel.org>
X-Mailing-List	linux-kernel@vger.kernel.org
Approved	robomod@news.nic.it
Lines	39
Organization	linux.* mail to news gateway
X-Original-Cc	Ralf Spenneberg <ralf@spenneberg.net>, Vladis Dronov <vdronov@redhat.com>, Ben Hutchings <ben@decadent.org.uk>, Willy Tarreau <w@1wt.eu>
X-Original-Date	Fri, 04 Mar 2016 16:30:01 +0100
X-Original-Message-ID	<20160304153000.747190867@1wt.eu>
X-Original-References	<148ee355b419e9976ca727513a1405c8@local>
X-Original-Sender	linux-kernel-owner@vger.kernel.org
Xref	csiph.com linux.kernel:1350379

Show key headers only | View raw

2.6.32-longterm review patch.  If anyone has any objections, please let me know.

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

From: Vladis Dronov <vdronov@redhat.com>

commit cb3232138e37129e88240a98a1d2aba2187ff57c upstream.

The visor driver crashes in clie_5_attach() when a specially crafted USB
device without bulk-out endpoint is detected. This fix adds a check that
the device has proper configuration expected by the driver.

Reported-by: Ralf Spenneberg <ralf@spenneberg.net>
Signed-off-by: Vladis Dronov <vdronov@redhat.com>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Willy Tarreau <w@1wt.eu>
---
 drivers/usb/serial/visor.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c
index 9af8c2f..e9229c5 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -921,8 +921,10 @@ static int clie_5_attach(struct usb_serial *serial)
 	 */
 
 	/* some sanity check */
-	if (serial->num_ports < 2)
-		return -1;
+	if (serial->num_bulk_out < 2) {
+		dev_err(&serial->interface->dev, "missing bulk out endpoints\n");
+		return -ENODEV;
+	}
 
 	/* port 0 now uses the modified endpoint Address */
 	serial->port[0]->bulk_out_endpointAddress =
-- 
1.7.12.2.21.g234cd45.dirty

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

Thread

[PATCH 2.6.32 01/55] usb: serial: visor: fix crash on detecting device  without write_urbs Willy Tarreau <w@1wt.eu> - 2016-03-04 17:20 +0100

csiph-web