summaryrefslogtreecommitdiffstats
path: root/drivers/usb/serial
diff options
context:
space:
mode:
authorJohan Hovold <jhovold@gmail.com>2013-10-09 17:01:09 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-10-11 17:01:25 -0700
commita91ccd26e75235d86248d018fe3779732bcafd8d (patch)
treeaf8bcbc5090e89782c28119b09abb178e411ea9c /drivers/usb/serial
parent706cd17e8559c96dc883ba692c931f1ef31fbc5c (diff)
downloadop-kernel-dev-a91ccd26e75235d86248d018fe3779732bcafd8d.zip
op-kernel-dev-a91ccd26e75235d86248d018fe3779732bcafd8d.tar.gz
USB: mos7840: fix tiocmget error handling
Make sure to return errors from tiocmget rather than rely on uninitialised stack data. Cc: stable@vger.kernel.org Signed-off-by: Johan Hovold <jhovold@gmail.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/serial')
-rw-r--r--drivers/usb/serial/mos7840.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
index fdf9535..e5bdd98 100644
--- a/drivers/usb/serial/mos7840.c
+++ b/drivers/usb/serial/mos7840.c
@@ -1532,7 +1532,11 @@ static int mos7840_tiocmget(struct tty_struct *tty)
return -ENODEV;
status = mos7840_get_uart_reg(port, MODEM_STATUS_REGISTER, &msr);
+ if (status != 1)
+ return -EIO;
status = mos7840_get_uart_reg(port, MODEM_CONTROL_REGISTER, &mcr);
+ if (status != 1)
+ return -EIO;
result = ((mcr & MCR_DTR) ? TIOCM_DTR : 0)
| ((mcr & MCR_RTS) ? TIOCM_RTS : 0)
| ((mcr & MCR_LOOPBACK) ? TIOCM_LOOP : 0)
OpenPOWER on IntegriCloud