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

USB: serial: io_edgeport: fix epic endpoint lookup

Make sure to use the current alternate setting when looking up the
endpoints on epic devices to avoid binding to an invalid interface.

Failing to do so could cause the driver to misbehave or trigger a WARN()
in usb_submit_urb() that kernels with panic_on_warn set would choke on.

Fixes: 6e8cf775 ("USB: add EPIC support to the io_edgeport driver")
Cc: stable <stable@vger.kernel.org>     # 2.6.21
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Link: https://lore.kernel.org/r/20191210112601.3561-5-johan@kernel.orgSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 19e6317d
...@@ -2901,16 +2901,18 @@ static int edge_startup(struct usb_serial *serial) ...@@ -2901,16 +2901,18 @@ static int edge_startup(struct usb_serial *serial)
response = 0; response = 0;
if (edge_serial->is_epic) { if (edge_serial->is_epic) {
struct usb_host_interface *alt;
alt = serial->interface->cur_altsetting;
/* EPIC thing, set up our interrupt polling now and our read /* EPIC thing, set up our interrupt polling now and our read
* urb, so that the device knows it really is connected. */ * urb, so that the device knows it really is connected. */
interrupt_in_found = bulk_in_found = bulk_out_found = false; interrupt_in_found = bulk_in_found = bulk_out_found = false;
for (i = 0; i < serial->interface->altsetting[0] for (i = 0; i < alt->desc.bNumEndpoints; ++i) {
.desc.bNumEndpoints; ++i) {
struct usb_endpoint_descriptor *endpoint; struct usb_endpoint_descriptor *endpoint;
int buffer_size; int buffer_size;
endpoint = &serial->interface->altsetting[0]. endpoint = &alt->endpoint[i].desc;
endpoint[i].desc;
buffer_size = usb_endpoint_maxp(endpoint); buffer_size = usb_endpoint_maxp(endpoint);
if (!interrupt_in_found && if (!interrupt_in_found &&
(usb_endpoint_is_int_in(endpoint))) { (usb_endpoint_is_int_in(endpoint))) {
......
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