Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da5a0fc6 authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman
Browse files

tty: Fix UML console breakage 



User-Mode Linux supplies an alternate TTY_MAJOR driver for stdio console,
so the noctty check in tty_open() must apply only to VT driver tty0
devnode and not the UML console driver tty0 devnode.

Fixes: 11e1d4aa ("tty: Consolidate noctty checks in tty_open()")
Reported-by: default avatarRichard Weinberger <richard.weinberger@gmail.com>
Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f55532a0

drivers/tty/tty_io.c

+1 −1
Original line number Diff line number Diff line
@@ -2158,7 +2158,7 @@ static int tty_open(struct inode *inode, struct file *filp) 
	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);