Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1587634

[PATCH 3.2 2/4] USB: serial: kl5kusb105: fix line-state error handling

Show all headers | View raw

3.2.86-rc1 review patch.  If anyone has any objections, please let me know.

------------------

From: Johan Hovold <johan@kernel.org>

commit 146cc8a17a3b4996f6805ee5c080e7101277c410 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: abf492e7b3ae ("USB: kl5kusb105: fix DMA buffers on stack")
Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2")
Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
---
 drivers/usb/serial/kl5kusb105.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

--- a/drivers/usb/serial/kl5kusb105.c
+++ b/drivers/usb/serial/kl5kusb105.c
@@ -209,10 +209,11 @@ static int klsi_105_get_line_state(struc
 			     status_buf, KLSI_STATUSBUF_LEN,
 			     10000
 			     );
-	if (rc < 0)
-		dev_err(&port->dev, "Reading line status failed (error = %d)\n",
-			rc);
-	else {
+	if (rc != KLSI_STATUSBUF_LEN) {
+		dev_err(&port->dev, "reading line status failed: %d\n", rc);
+		if (rc >= 0)
+			rc = -EIO;
+	} else {
 		status = get_unaligned_le16(status_buf);
 
 		dev_info(&port->serial->dev->dev, "read status %x %x",

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 3.2 0/4] 3.2.86-rc1 review Ben Hutchings <ben@decadent.org.uk> - 2017-02-24 14:20 +0100
  [PATCH 3.2 2/4] USB: serial: kl5kusb105: fix line-state error  handling Ben Hutchings <ben@decadent.org.uk> - 2017-02-24 14:20 +0100
  [PATCH 3.2 1/4] kvm: nVMX: Allow L1 to intercept software  exceptions (#BP and #OF) Ben Hutchings <ben@decadent.org.uk> - 2017-02-24 14:20 +0100
  [PATCH 3.2 4/4] tcp: avoid infinite loop in tcp_splice_read() Ben Hutchings <ben@decadent.org.uk> - 2017-02-24 14:20 +0100
  [PATCH 3.2 3/4] dccp: fix freeing skb too early for IPV6_RECVPKTINFO Ben Hutchings <ben@decadent.org.uk> - 2017-02-24 14:20 +0100
  Re: [PATCH 3.2 0/4] 3.2.86-rc1 review Guenter Roeck <linux@roeck-us.net> - 2017-02-24 17:20 +0100
    Re: [PATCH 3.2 0/4] 3.2.86-rc1 review Ben Hutchings <ben@decadent.org.uk> - 2017-02-24 17:40 +0100

csiph-web