Browse Source

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>
Johan Hovold 7 years ago
parent
commit
01b3cdfca2
1 changed files with 3 additions and 1 deletions
  1. 3 1
      drivers/usb/serial/keyspan_pda.c

+ 3 - 1
drivers/usb/serial/keyspan_pda.c

@@ -369,8 +369,10 @@ static int keyspan_pda_get_modem_info(struct usb_serial *serial,
 			     3, /* get pins */
 			     3, /* get pins */
 			     USB_TYPE_VENDOR|USB_RECIP_INTERFACE|USB_DIR_IN,
 			     USB_TYPE_VENDOR|USB_RECIP_INTERFACE|USB_DIR_IN,
 			     0, 0, data, 1, 2000);
 			     0, 0, data, 1, 2000);
-	if (rc >= 0)
+	if (rc == 1)
 		*value = *data;
 		*value = *data;
+	else if (rc >= 0)
+		rc = -EIO;
 
 
 	kfree(data);
 	kfree(data);
 	return rc;
 	return rc;