aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohan Hovold <johan@kernel.org>2018-07-04 17:02:16 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-07-17 11:37:52 +0200
commit7e7c86d2757067f52fa1a81f5d472f5662bd0e7f (patch)
tree952114afadee8f572507f145cf63b74f14a654a7
parent4115045f9588e794c091c5fbc2a85f2e1f03e260 (diff)
downloadlinux-linaro-stable-7e7c86d2757067f52fa1a81f5d472f5662bd0e7f.tar.gz
USB: serial: keyspan_pda: fix modem-status error handling
commit 01b3cdfca263a17554f7b249d20a247b2a751521 upstream. 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 <stable@vger.kernel.org> # 2.6.27 Signed-off-by: Johan Hovold <johan@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/usb/serial/keyspan_pda.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c
index d2dab2a341b8..d17f7872f95a 100644
--- a/drivers/usb/serial/keyspan_pda.c
+++ b/drivers/usb/serial/keyspan_pda.c
@@ -373,8 +373,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;