Skip to contentSkip to conversation

Patch "USB: serial: kl5kusb105: fix line-state error handling" has been added to the 4.9-stable tree

PATCH [email protected] 1 participant 1 message Jan 17, 2017

Subsystems (3)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

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

to the 4.9-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
usb-serial-kl5kusb105-fix-line-state-error-handling.patch
and it can be found in the queue-4.9 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

Quoted 1 line

From 146cc8a17a3b4996f6805ee5c080e7101277c410 Mon Sep 17 00:00:00 2001

From: Johan Hovold <[email protected]>
Date: Tue, 10 Jan 2017 12:05:37 +0100
Subject: USB: serial: kl5kusb105: fix line-state error handling

From: Johan Hovold <[email protected]>

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")
---
 drivers/usb/serial/kl5kusb105.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/usb/serial/kl5kusb105.c +5 -4
@@ -192,10 +192,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\n",

Patches currently in stable-queue which might be from [email protected] are

queue-4.9/usb-serial-ch341-fix-control-message-error-handling.patch queue-4.9/usb-serial-ch341-fix-open-and-resume-after-b0.patch queue-4.9/usb-serial-ch341-fix-open-error-handling.patch queue-4.9/usb-serial-ch341-fix-initial-modem-control-state.patch queue-4.9/usb-serial-kl5kusb105-fix-line-state-error-handling.patch queue-4.9/usb-serial-ch341-fix-resume-after-reset.patch