Merge tag 'tty-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty fixes from Greg KH:
 "Here are two tty fixes for issues found.

  One was due to a merge error in 4.6-rc1, and the other a regression
  fix for UML consoles that broke in 4.6-rc1.

  Both have been in linux-next for a while"

* tag 'tty-4.6-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty: Fix merge of "tty: Refactor tty_open()"
  tty: Fix UML console breakage

1 files changed, 2 insertions, 3 deletions

diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c
index 8d26ed79bb4c..9b04d72e752e 100644
--- a/drivers/tty/tty_io.c
+++ b/drivers/tty/tty_io.c
@@ -2049,14 +2049,13 @@ static struct tty_struct *tty_open_by_driver(dev_t device, struct inode *inode,
         if (tty) {
                 mutex_unlock(&tty_mutex);
                 retval = tty_lock_interruptible(tty);
+                tty_kref_put(tty);  /* drop kref from tty_driver_lookup_tty() */
                 if (retval) {
                         if (retval == -EINTR)
                                 retval = -ERESTARTSYS;
                         tty = ERR_PTR(retval);
                         goto out;
                 }
-                /* safe to drop the kref from tty_driver_lookup_tty() */
-                tty_kref_put(tty);
                 retval = tty_reopen(tty);
                 if (retval < 0) {
                         tty_unlock(tty);
@@ -2158,7 +2157,7 @@ retry_open:
         read_lock(&tasklist_lock);
         spin_lock_irq(&current->sighand->siglock);
         noctty = (filp->f_flags & O_NOCTTY) ||
-                        device == MKDEV(TTY_MAJOR, 0) ||
+                        (IS_ENABLED(CONFIG_VT) && device == MKDEV(TTY_MAJOR, 0)) ||
                         device == MKDEV(TTYAUX_MAJOR, 1) ||
                         (tty->driver->type == TTY_DRIVER_TYPE_PTY &&
                          tty->driver->subtype == PTY_TYPE_MASTER);