diff options
| author |   Jiri Slaby <jslaby@suse.cz> | 2011-10-12 11:32:44 +0200 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@suse.de> | 2011-10-18 16:39:44 -0700 |
| commit | 1177c0efc04d032644895b8d757f55b433912596 (patch) | |
| tree | 6f6a2230d2b4d15a8c0673c5167559df9fd06e49 /drivers/tty | |
| parent | TTY: make tty_add_file non-failing (diff) | |
| download | linux-dev-1177c0efc04d032644895b8d757f55b433912596.tar.xz linux-dev-1177c0efc04d032644895b8d757f55b433912596.zip | |
TTY: pty, release tty in all ptmx_open fail paths
Mistakenly, commit 64ba3dc3143d (tty: never hold BTM while getting
tty_mutex) switched one fail path in ptmx_open to not free the newly
allocated tty.
Fix that by jumping to the appropriate place. And rename the labels so
that it's clear what is going on there.
Introduced-in: v2.6.36-rc2
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: stable <stable@vger.kernel.org>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty')
| -rw-r--r-- | drivers/tty/pty.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/tty/pty.c b/drivers/tty/pty.c index 7613f95f2d6b..2feea63d497a 100644 --- a/drivers/tty/pty.c +++ b/drivers/tty/pty.c @@ -686,15 +686,15 @@ static int ptmx_open(struct inode *inode, struct file *filp) retval = devpts_pty_new(inode, tty->link); if (retval) - goto out1; + goto err_release; retval = ptm_driver->ops->open(tty, filp); if (retval) - goto out2; -out1: + goto err_release; + tty_unlock(); - return retval; -out2: + return 0; +err_release: tty_unlock(); tty_release(inode, filp); return retval; |