Path: csiph.com!news.mixmin.net!aioe.org!bofh.it!news.nic.it!robomod From: Willy Tarreau Newsgroups: linux.kernel Subject: [PATCH 2.6.32 03/55] USB: visor: fix null-deref at probe Date: Fri, 04 Mar 2016 17:20:01 +0100 Message-ID: References: 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: X-Mailing-List: linux-kernel@vger.kernel.org Approved: robomod@news.nic.it Lines: 41 Organization: linux.* mail to news gateway X-Original-Cc: Johan Hovold , Ben Hutchings , Willy Tarreau X-Original-Date: Fri, 04 Mar 2016 16:30:03 +0100 X-Original-Message-ID: <20160304153000.841347698@1wt.eu> X-Original-References: <148ee355b419e9976ca727513a1405c8@local> X-Original-Sender: linux-kernel-owner@vger.kernel.org Xref: csiph.com linux.kernel:1350378 2.6.32-longterm review patch. If anyone has any objections, please let me know. ------------------ From: Johan Hovold 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 Signed-off-by: Ben Hutchings Signed-off-by: Willy Tarreau --- drivers/usb/serial/visor.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/drivers/usb/serial/visor.c b/drivers/usb/serial/visor.c index e9229c5..741d834 100644 --- a/drivers/usb/serial/visor.c +++ b/drivers/usb/serial/visor.c @@ -878,6 +878,11 @@ static int treo_attach(struct usb_serial *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, -- 1.7.12.2.21.g234cd45.dirty