diff options
| author |   Jiri Slaby <jslaby@suse.cz> | 2012-11-15 09:49:56 +0100 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-11-15 17:20:58 -0800 |
| commit | 191c5f10275cfbb36802edadbdb10c73537327b4 (patch) | |
| tree | 93e6f0d57cb1295fb7c461dbe5ecefafeb4ad15a /drivers/s390/char/tty3270.c | |
| parent | TTY: isicom, fix tty buffers memory leak (diff) | |
| download | wireguard-linux-191c5f10275cfbb36802edadbdb10c73537327b4.tar.xz wireguard-linux-191c5f10275cfbb36802edadbdb10c73537327b4.zip | |
TTY: call tty_port_destroy in the rest of drivers
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.
To be sure, the TTY buffers (and later some stuff) are gone along with
the tty_port, we have to call tty_port_destroy at tear-down places.
This is mostly where the structure containing a tty_port is freed.
This patch does exactly that -- put tty_port_destroy at those places.
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/s390/char/tty3270.c')
| -rw-r--r-- | drivers/s390/char/tty3270.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/s390/char/tty3270.c b/drivers/s390/char/tty3270.c index 482ee028f842..43ea0593bdb0 100644 --- a/drivers/s390/char/tty3270.c +++ b/drivers/s390/char/tty3270.c @@ -722,6 +722,7 @@ out_pages: while (pages--) free_pages((unsigned long) tp->freemem_pages[pages], 0); kfree(tp->freemem_pages); + tty_port_destroy(&tp->port); out_tp: kfree(tp); out_err: @@ -744,6 +745,7 @@ tty3270_free_view(struct tty3270 *tp) for (pages = 0; pages < TTY3270_STRING_PAGES; pages++) free_pages((unsigned long) tp->freemem_pages[pages], 0); kfree(tp->freemem_pages); + tty_port_destroy(&tp->port); kfree(tp); } |