Commit bd73bd88 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

USB: usb_wwan: fix handling of missing bulk endpoints

Fix regression introduced by commit 8e493ca1 ("USB: usb_wwan: fix
bulk-urb allocation") by making sure to require both bulk-in and out
endpoints during port probe.

The original option driver (which usb_wwan is based on) was written
under the assumption that either endpoint could be missing, but
evidently this cannot have been tested properly. Specifically, it would
handle opening a device without bulk-in (but would blow up during resume
which was implemented later), but not a missing bulk-out in write()
(although it is handled in some places such as write_room()).

Fortunately (?), the driver also got the test for missing endpoints
wrong so the urbs were in fact always allocated, although they would be
initialised using the wrong endpoint address (0) and any submission of
such an urb would fail.

The commit mentioned above fixed the test for missing endpoints but
thereby exposed the other bugs which would now generate null-pointer
exceptions rather than failed urb submissions.

The regression was introduced in v3.7, but the offending commit was also
marked for stable.
Reported-by: default avatarRafał Miłecki <zajec5@gmail.com>
Cc: stable <stable@vger.kernel.org>
Signed-off-by: default avatarJohan Hovold <jhovold@gmail.com>
Tested-by: default avatarRafał Miłecki <zajec5@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent b16c02fb
...@@ -466,6 +466,9 @@ int usb_wwan_port_probe(struct usb_serial_port *port) ...@@ -466,6 +466,9 @@ int usb_wwan_port_probe(struct usb_serial_port *port)
int err; int err;
int i; int i;
if (!port->bulk_in_size || !port->bulk_out_size)
return -ENODEV;
portdata = kzalloc(sizeof(*portdata), GFP_KERNEL); portdata = kzalloc(sizeof(*portdata), GFP_KERNEL);
if (!portdata) if (!portdata)
return -ENOMEM; return -ENOMEM;
...@@ -473,9 +476,6 @@ int usb_wwan_port_probe(struct usb_serial_port *port) ...@@ -473,9 +476,6 @@ int usb_wwan_port_probe(struct usb_serial_port *port)
init_usb_anchor(&portdata->delayed); init_usb_anchor(&portdata->delayed);
for (i = 0; i < N_IN_URB; i++) { for (i = 0; i < N_IN_URB; i++) {
if (!port->bulk_in_size)
break;
buffer = (u8 *)__get_free_page(GFP_KERNEL); buffer = (u8 *)__get_free_page(GFP_KERNEL);
if (!buffer) if (!buffer)
goto bail_out_error; goto bail_out_error;
...@@ -489,9 +489,6 @@ int usb_wwan_port_probe(struct usb_serial_port *port) ...@@ -489,9 +489,6 @@ int usb_wwan_port_probe(struct usb_serial_port *port)
} }
for (i = 0; i < N_OUT_URB; i++) { for (i = 0; i < N_OUT_URB; i++) {
if (!port->bulk_out_size)
break;
buffer = kmalloc(OUT_BUFLEN, GFP_KERNEL); buffer = kmalloc(OUT_BUFLEN, GFP_KERNEL);
if (!buffer) if (!buffer)
goto bail_out_error2; goto bail_out_error2;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment