]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
serial: pch_uart: fix tty-kref leak in dma-rx path
authorJohan Hovold <jhovold@gmail.com>
Tue, 10 Sep 2013 10:50:50 +0000 (12:50 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 5 Oct 2013 14:13:10 +0000 (07:13 -0700)
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>
drivers/tty/serial/pch_uart.c

index 591cadb0bcc395667374917f48e159dd42d8c349..20e4c9446992b142970b2bfd1f179e37eadf611d 100644 (file)
@@ -658,11 +658,12 @@ static int dma_push_rx(struct eg20t_port *priv, int size)
                dev_warn(port->dev, "Rx overrun: dropping %u bytes\n",
                         size - room);
        if (!room)
-               return room;
+               goto out;
 
        tty_insert_flip_string(tport, sg_virt(&priv->sg_rx), size);
 
        port->icount.rx += room;
+out:
        tty_kref_put(tty);
 
        return room;