lkml.org 
[lkml]   [2013]   [Dec]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 3.8 011/152] USB: mos7840: fix tiocmget error handling
    Date
    3.8.13.14 -stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Johan Hovold <jhovold@gmail.com>

    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: Kamal Mostafa <kamal@canonical.com>
    ---
    drivers/usb/serial/mos7840.c | 4 ++++
    1 file changed, 4 insertions(+)

    diff --git a/drivers/usb/serial/mos7840.c b/drivers/usb/serial/mos7840.c
    index 85f28bf..84502ea 100644
    --- a/drivers/usb/serial/mos7840.c
    +++ b/drivers/usb/serial/mos7840.c
    @@ -1644,7 +1644,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)
    --
    1.8.3.2


    \
     
     \ /
      Last update: 2013-12-07 01:41    [W:4.113 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site