Commit 59021c05 authored by Johan Hovold's avatar Johan Hovold Committed by Ben Hutchings

USB: serial: kl5kusb105: fix line-state error handling

commit 146cc8a1 upstream.

The current implementation failed to detect short transfers when
attempting to read the line state, and also, to make things worse,
logged the content of the uninitialised heap transfer buffer.

Fixes: abf492e7 ("USB: kl5kusb105: fix DMA buffers on stack")
Fixes: 1da177e4 ("Linux-2.6.12-rc2")
Reviewed-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Signed-off-by: default avatarBen Hutchings <ben@decadent.org.uk>
parent 06462173
...@@ -195,10 +195,11 @@ static int klsi_105_get_line_state(struct usb_serial_port *port, ...@@ -195,10 +195,11 @@ static int klsi_105_get_line_state(struct usb_serial_port *port,
status_buf, KLSI_STATUSBUF_LEN, status_buf, KLSI_STATUSBUF_LEN,
10000 10000
); );
if (rc < 0) if (rc != KLSI_STATUSBUF_LEN) {
dev_err(&port->dev, "Reading line status failed (error = %d)\n", dev_err(&port->dev, "reading line status failed: %d\n", rc);
rc); if (rc >= 0)
else { rc = -EIO;
} else {
status = get_unaligned_le16(status_buf); status = get_unaligned_le16(status_buf);
dev_info(&port->serial->dev->dev, "read status %x %x\n", dev_info(&port->serial->dev->dev, "read status %x %x\n",
......
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