Skip to contentSkip to conversation

patch "USB: serial: keyspan_pda: fix modem-status error handling" added to usb-linus

PATCH [email protected] 1 participant 1 message Jul 6, 2018

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: keyspan_pda: fix modem-status error handling

to my usb git tree which can be found at
git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git
in the usb-linus branch.

The patch will show up in the next release of the linux-next tree (usually sometime within the next 24 hours during the week.)

The patch will hopefully also be merged in Linus's tree for the next -rc kernel release.

If you have any questions about this process, please let me know.

Quoted 1 line

From 01b3cdfca263a17554f7b249d20a247b2a751521 Mon Sep 17 00:00:00 2001

From: Johan Hovold <[email protected]>
Date: Wed, 4 Jul 2018 17:02:16 +0200
Subject: USB: serial: keyspan_pda: fix modem-status error handling

Fix broken modem-status error handling which could lead to bits of slab data leaking to user space.

Fixes 3b36a8fd6777 ("usb: fix uninitialized variable warning in keyspan_pda")
Cc stable <[email protected]> # 2.6.27
---
 drivers/usb/serial/keyspan_pda.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/usb/serial/keyspan_pda.c +3 -1
index 5169624d8b11..38d43c4b7ce5 100644
@@ -369,8 +369,10 @@ static int keyspan_pda_get_modem_info(struct usb_serial *serial,
 			     3, /* get pins */
 			     USB_TYPE_VENDOR|USB_RECIP_INTERFACE|USB_DIR_IN,
 			     0, 0, data, 1, 2000);
-	if (rc >= 0)
+	if (rc == 1)
 		*value = *data;
+	else if (rc >= 0)
+		rc = -EIO;
 
 	kfree(data);
 	return rc;
Signature · 1 line
2.18.0