mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
TTY: pty, release tty in all ptmx_open fail paths
Mistakenly, commit 64ba3dc314 (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 <[email protected]>
Cc: stable <[email protected]>
Cc: Arnd Bergmann <[email protected]>
Cc: Alan Cox <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
fa90e1c935
commit
1177c0efc0
1 changed files with 5 additions and 5 deletions
|
|
@ -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;
|
||||
|
|
|
|||
Loading…
Reference in a new issue