[3.16.y-ckt stable] Patch "USB: visor: fix null-deref at probe" has been added to the 3.16.y-ckt tree
Luis Henriques
luis.henriques at canonical.com
Wed Feb 17 10:49:07 UTC 2016
This is a note to let you know that I have just added a patch titled
USB: visor: fix null-deref at probe
to the linux-3.16.y-queue branch of the 3.16.y-ckt extended stable tree
which can be found at:
http://kernel.ubuntu.com/git/ubuntu/linux.git/log/?h=linux-3.16.y-queue
This patch is scheduled to be released in version 3.16.7-ckt25.
If you, or anyone else, feels it should not be added to this tree, please
reply to this email.
For more information about the 3.16.y-ckt tree, see
https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable
Thanks.
-Luis
---8<------------------------------------------------------------
>From 2e943fbce619e71cd28adc23abe2104f5675bdc3 Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan at kernel.org>
Date: Tue, 12 Jan 2016 12:05:20 +0100
Subject: USB: visor: fix null-deref at probe
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 at kernel.org>
Signed-off-by: Luis Henriques <luis.henriques at canonical.com>
---
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 bbc90c059002..337a0be89fcf 100644
--- a/drivers/usb/serial/visor.c
+++ b/drivers/usb/serial/visor.c
@@ -544,6 +544,11 @@ static int treo_attach(struct usb_serial *serial)
(serial->num_interrupt_in == 0))
return 0;
+ 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,
More information about the kernel-team
mailing list