lkml.org 
[lkml]   [2017]   [Jun]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.16 041/212] USB: serial: ark3116: fix register-accessor error handling
    3.16.44-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Johan Hovold <johan@kernel.org>

    commit 9fef37d7cf170522fb354d6d0ea6de09b9b16678 upstream.

    The current implementation failed to detect short transfers, something
    which could lead to bits of the uninitialised heap transfer buffer
    leaking to user space.

    Fixes: 149fc791a452 ("USB: ark3116: Setup some basic infrastructure for
    new ark3116 driver.")
    Fixes: f4c1e8d597d1 ("USB: ark3116: Make existing functions 16450-aware
    and add close and release functions.")
    Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    Signed-off-by: Johan Hovold <johan@kernel.org>
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/usb/serial/ark3116.c | 13 ++++++++++---
    1 file changed, 10 insertions(+), 3 deletions(-)

    --- a/drivers/usb/serial/ark3116.c
    +++ b/drivers/usb/serial/ark3116.c
    @@ -99,10 +99,17 @@ static int ark3116_read_reg(struct usb_s
    usb_rcvctrlpipe(serial->dev, 0),
    0xfe, 0xc0, 0, reg,
    buf, 1, ARK_TIMEOUT);
    - if (result < 0)
    + if (result < 1) {
    + dev_err(&serial->interface->dev,
    + "failed to read register %u: %d\n",
    + reg, result);
    + if (result >= 0)
    + result = -EIO;
    +
    return result;
    - else
    - return buf[0];
    + }
    +
    + return buf[0];
    }

    static inline int calc_divisor(int bps)
    \
     
     \ /
      Last update: 2017-06-01 18:27    [W:4.051 / U:0.160 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site