diff options
| author | Johan Hovold <jhovold@gmail.com> | 2013-10-09 17:01:09 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-01-03 04:33:14 +0000 |
| commit | 868272660822f69f4653b1d2609a02231d3944e6 (patch) | |
| tree | 0d6ff9b323daf7e98414e0684e6654fb0682c162 /drivers/usb/serial/mos7840.c | |
| parent | 920362294face70e146b4b2f65dc642c2e9b67f8 (diff) | |
| download | kernel_samsung_smdk4412-868272660822f69f4653b1d2609a02231d3944e6.zip kernel_samsung_smdk4412-868272660822f69f4653b1d2609a02231d3944e6.tar.gz kernel_samsung_smdk4412-868272660822f69f4653b1d2609a02231d3944e6.tar.bz2 | |
USB: mos7840: fix tiocmget error handling
commit a91ccd26e75235d86248d018fe3779732bcafd8d upstream.
Make sure to return errors from tiocmget rather than rely on
uninitialised stack data.
Signed-off-by: Johan Hovold <jhovold@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'drivers/usb/serial/mos7840.c')
| -rw-r--r-- | drivers/usb/serial/mos7840.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c index 5d2501e..4c06746 100644 --- a/drivers/usb/serial/mos7840.c +++ b/drivers/usb/serial/mos7840.c @@ -1689,7 +1689,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) |