Эх сурвалжийг харах

USB: opticon: Fix long-standing bugs in opticon driver

The bulk-read callback had two bugs:
a) The bulk-in packet's leading two zeros were returned (and the two last
   bytes truncated)
b) The wrong URB was transmitted for the second (and later) read requests,
   causing further reads to return the entire packet (including leading
   zeros)

Signed-off-by: Alon Ziv <alon-git@nolaviz.org>
Cc: stable <stable@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Alon Ziv 14 жил өмнө
parent
commit
97cd8dc4ca

+ 3 - 3
drivers/usb/serial/opticon.c

@@ -96,8 +96,8 @@ static void opticon_bulk_callback(struct urb *urb)
 			/* real data, send it to the tty layer */
 			/* real data, send it to the tty layer */
 			tty = tty_port_tty_get(&port->port);
 			tty = tty_port_tty_get(&port->port);
 			if (tty) {
 			if (tty) {
-				tty_insert_flip_string(tty, data,
-							       data_length);
+				tty_insert_flip_string(tty, data + 2,
+						       data_length);
 				tty_flip_buffer_push(tty);
 				tty_flip_buffer_push(tty);
 				tty_kref_put(tty);
 				tty_kref_put(tty);
 			}
 			}
@@ -130,7 +130,7 @@ exit:
 						  priv->bulk_address),
 						  priv->bulk_address),
 				  priv->bulk_in_buffer, priv->buffer_size,
 				  priv->bulk_in_buffer, priv->buffer_size,
 				  opticon_bulk_callback, priv);
 				  opticon_bulk_callback, priv);
-		result = usb_submit_urb(port->read_urb, GFP_ATOMIC);
+		result = usb_submit_urb(priv->bulk_read_urb, GFP_ATOMIC);
 		if (result)
 		if (result)
 			dev_err(&port->dev,
 			dev_err(&port->dev,
 			    "%s - failed resubmitting read urb, error %d\n",
 			    "%s - failed resubmitting read urb, error %d\n",