lkml.org 
[lkml]   [2013]   [Oct]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Date
    Subject[PATCH 3.2 080/149] serial: pch_uart: fix tty-kref leak in dma-rx path
    3.2.52-rc1 review patch.  If anyone has any objections, please let me know.

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

    From: Johan Hovold <jhovold@gmail.com>

    commit 19b85cfb190eb9980eaf416bff96aef4159a430e upstream.

    Fix tty_kref leak when tty_buffer_request room fails in dma-rx path.

    Note that the tty ref isn't really needed anymore, but as the leak has
    always been there, fixing it before removing should makes it easier to
    backport the fix.

    Signed-off-by: Johan Hovold <jhovold@gmail.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    [bwh: Backported to 3.2: adjust context]
    Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
    ---
    drivers/tty/serial/pch_uart.c | 3 ++-
    1 file changed, 2 insertions(+), 1 deletion(-)

    --- a/drivers/tty/serial/pch_uart.c
    +++ b/drivers/tty/serial/pch_uart.c
    @@ -552,11 +552,12 @@ static int dma_push_rx(struct eg20t_port
    dev_warn(port->dev, "Rx overrun: dropping %u bytes\n",
    size - room);
    if (!room)
    - return room;
    + goto out;

    tty_insert_flip_string(tty, sg_virt(&priv->sg_rx), size);

    port->icount.rx += room;
    +out:
    tty_kref_put(tty);

    return room;


    \
     
     \ /
      Last update: 2013-10-21 11:41    [W:4.033 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site