aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty
diff options
context:
space:
mode:
authorJiri Slaby <jslaby@suse.cz>2012-11-15 03:49:49 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-11-15 20:18:55 -0500
commit81c79838ca24f48e0e4bb96502d131d6af758ae0 (patch)
tree2ca7959df8ebba974bc9ba9011ab25e0550ed63d /drivers/tty
parent7342c59a44ad9e5f30baaa2de84830f40b9f06c0 (diff)
TTY: pty, fix tty buffers leak
After commit "TTY: move tty buffers to tty_port", the tty buffers are not freed in some drivers. This is because tty_port_destructor is not called whenever a tty_port is freed. This was an assumption I counted with but was unfortunately untrue. So fix the drivers to fulfil this assumption. PTY is one of those, here we just need to use tty_port_put instead of kfree. (Assuming tty_port_destructor does not need port->ops to be set which we change here too.) Signed-off-by: Jiri Slaby <jslaby@suse.cz> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/tty')
-rw-r--r--drivers/tty/pty.c2
-rw-r--r--drivers/tty/tty_port.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c
index 0ce0b3ec2bb0..a541ec875932 100644
--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -408,7 +408,7 @@ static void pty_unix98_shutdown(struct tty_struct *tty)
408static void pty_cleanup(struct tty_struct *tty) 408static void pty_cleanup(struct tty_struct *tty)
409{ 409{
410 tty->port->itty = NULL; 410 tty->port->itty = NULL;
411 kfree(tty->port); 411 tty_port_put(tty->port);
412} 412}
413 413
414/* Traditional BSD devices */ 414/* Traditional BSD devices */
diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c
index 416b42f7c346..fdc42c2d565f 100644
--- a/drivers/tty/tty_port.c
+++ b/drivers/tty/tty_port.c
@@ -128,7 +128,7 @@ static void tty_port_destructor(struct kref *kref)
128 if (port->xmit_buf) 128 if (port->xmit_buf)
129 free_page((unsigned long)port->xmit_buf); 129 free_page((unsigned long)port->xmit_buf);
130 tty_buffer_free_all(port); 130 tty_buffer_free_all(port);
131 if (port->ops->destruct) 131 if (port->ops && port->ops->destruct)
132 port->ops->destruct(port); 132 port->ops->destruct(port);
133 else 133 else
134 kfree(port); 134 kfree(port);