evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "TTY: call tty_driver_lookup_tty unconditionally"

Browse source 
This reverts commit 631180aca7.

It caused problems when /dev/tty is a pty:
	https://lkml.org/lkml/2011/10/12/401

Cc: Jiri Slaby <jslaby@suse.cz>
Cc: stable <stable@vger.kernel.org>
Cc: Sukadev Bhattiprolu <sukadev@us.ibm.com>
Cc: Alan Cox <alan@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Greg Kroah-Hartman 2011-10-19 08:33:21 -07:00
parent 5fbe46b676
commit a034070398
1 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/tty/tty_io.c
View file

@ -1821,7 +1821,7 @@ int tty_release(struct inode *inode, struct file *filp)
static int tty_open(struct inode *inode, struct file *filp) static int tty_open(struct inode *inode, struct file *filp)
{ {
struct tty_struct *tty; struct tty_struct *tty = NULL;
int noctty, retval; int noctty, retval;
struct tty_driver *driver; struct tty_driver *driver;
int index; int index;
@ -1892,14 +1892,17 @@ retry_open:
return -ENODEV; return -ENODEV;
} }
got_driver: got_driver:
/* check whether we're reopening an existing tty */ if (!tty) {
tty = tty_driver_lookup_tty(driver, inode, index); /* check whether we're reopening an existing tty */
if (IS_ERR(tty)) { tty = tty_driver_lookup_tty(driver, inode, index);
tty_unlock();
mutex_unlock(&tty_mutex); if (IS_ERR(tty)) {
tty_driver_kref_put(driver); tty_unlock();
tty_free_file(filp); mutex_unlock(&tty_mutex);
return PTR_ERR(tty); tty_driver_kref_put(driver);
tty_free_file(filp);
return PTR_ERR(tty);
}
} }
if (tty) { if (tty) {