Comments
Patch
@@ -453,9 +453,6 @@ static struct urb *usb_wwan_setup_urb(struct usb_serial *serial, int endpoint,
{
struct urb *urb;
- if (endpoint == -1)
- return NULL; /* endpoint not needed */
-
urb = usb_alloc_urb(0, GFP_KERNEL); /* No ISO */
if (urb == NULL) {
dbg("%s: alloc for endpoint %d failed.", __func__, endpoint);
@@ -483,6 +480,9 @@ static void usb_wwan_setup_urbs(struct usb_serial *serial)
/* Do indat endpoints first */
for (j = 0; j < N_IN_URB; ++j) {
+ if (!port->bulk_in_size)
+ break;
+
portdata->in_urbs[j] = usb_wwan_setup_urb(serial,
port->
bulk_in_endpointAddress,
@@ -496,6 +496,9 @@ static void usb_wwan_setup_urbs(struct usb_serial *serial)
/* outdat endpoints */
for (j = 0; j < N_OUT_URB; ++j) {
+ if (!port->bulk_out_size)
+ break;
+
portdata->out_urbs[j] = usb_wwan_setup_urb(serial,
port->
bulk_out_endpointAddress,
@@ -529,6 +532,9 @@ int usb_wwan_startup(struct usb_serial *serial)
init_usb_anchor(&portdata->delayed);
for (j = 0; j < N_IN_URB; j++) {
+ if (!port->bulk_in_size)
+ break;
+
buffer = (u8 *) __get_free_page(GFP_KERNEL);
if (!buffer)
goto bail_out_error;
@@ -536,6 +542,9 @@ int usb_wwan_startup(struct usb_serial *serial)
}
for (j = 0; j < N_OUT_URB; j++) {
+ if (!port->bulk_out_size)
+ break;
+
buffer = kmalloc(OUT_BUFLEN, GFP_KERNEL);
if (!buffer)
goto bail_out_error2;
This is a note to let you know that I have just added a patch titled USB: usb_wwan: fix bulk-urb allocation to the linux-3.5.y-queue branch of the 3.5.y.z extended stable tree which can be found at: http://kernel.ubuntu.com/git?p=ubuntu/linux.git;a=shortlog;h=refs/heads/linux-3.5.y-queue 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.5.y.z tree, see https://wiki.ubuntu.com/Kernel/Dev/ExtendedStable Thanks. -Herton ------ From 3afe447b6da0a76d40119b431778150445c7ff66 Mon Sep 17 00:00:00 2001 From: Johan Hovold <jhovold@gmail.com> Date: Fri, 26 Oct 2012 18:44:20 +0200 Subject: [PATCH] USB: usb_wwan: fix bulk-urb allocation commit 8e493ca1767d4951ed1322abaa74d6edbca29918 upstream. Make sure we do not allocate urbs if we do not have a bulk endpoint. Legacy code used incorrect assumption to test for bulk endpoints. Reported-by: Dan Carpenter <dan.carpenter@oracle.com> Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> [ herton: backport for 3.5: allocation splitted in attach (in usb_wwan_setup_urbs and usb_wwan_startup), so patch two locations with the size checking. ] Signed-off-by: Herton Ronaldo Krzesinski <herton.krzesinski@canonical.com> --- drivers/usb/serial/usb_wwan.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) -- 1.7.9.5