diff options
author | Johan Hovold <johan@kernel.org> | 2018-07-04 11:02:16 -0400 |
---|---|---|
committer | Johan Hovold <johan@kernel.org> | 2018-07-06 04:32:14 -0400 |
commit | 01b3cdfca263a17554f7b249d20a247b2a751521 (patch) | |
tree | c711b2e066902b210528b6ea49fae3d2d436b391 | |
parent | 367b160fe4717c14a2a978b6f9ffb75a7762d3ed (diff) |
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 <stable@vger.kernel.org> # 2.6.27
Signed-off-by: Johan Hovold <johan@kernel.org>
-rw-r--r-- | drivers/usb/serial/keyspan_pda.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/usb/serial/keyspan_pda.c b/drivers/usb/serial/keyspan_pda.c index 5169624d8b11..38d43c4b7ce5 100644 --- a/drivers/usb/serial/keyspan_pda.c +++ b/drivers/usb/serial/keyspan_pda.c | |||
@@ -369,8 +369,10 @@ static int keyspan_pda_get_modem_info(struct usb_serial *serial, | |||
369 | 3, /* get pins */ | 369 | 3, /* get pins */ |
370 | USB_TYPE_VENDOR|USB_RECIP_INTERFACE|USB_DIR_IN, | 370 | USB_TYPE_VENDOR|USB_RECIP_INTERFACE|USB_DIR_IN, |
371 | 0, 0, data, 1, 2000); | 371 | 0, 0, data, 1, 2000); |
372 | if (rc >= 0) | 372 | if (rc == 1) |
373 | *value = *data; | 373 | *value = *data; |
374 | else if (rc >= 0) | ||
375 | rc = -EIO; | ||
374 | 376 | ||
375 | kfree(data); | 377 | kfree(data); |
376 | return rc; | 378 | return rc; |