[lkml]   [2011]   [Nov]   [10]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
Messages in this thread
Patch in this message
Subject[006/262] TTY: pty, release tty in all ptmx_open fail paths
3.0-stable review patch.  If anyone has any objections, please let me know.


From: Jiri Slaby <>

commit 1177c0efc04d032644895b8d757f55b433912596 upstream.

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 <>
Cc: Arnd Bergmann <>
Cc: Alan Cox <>
Signed-off-by: Greg Kroah-Hartman <>

drivers/tty/pty.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)

--- a/drivers/tty/pty.c
+++ b/drivers/tty/pty.c
@@ -699,15 +699,15 @@ static int ptmx_open(struct inode *inode

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;
+ goto err_release;
- return retval;
+ return 0;
tty_release(inode, filp);
return retval;

 \ /
  Last update: 2011-11-10 06:31    [W:0.565 / U:1.668 seconds]
©2003-2018 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site