Commit 2ae0b31e authored Nov 22, 2019 by Jiri Slaby Committed by Greg Kroah-Hartman Nov 22, 2019

tty: don't crash in tty_init_dev when missing tty_port



We currently warn the user when tty->port is not set in tty_init_dev
yet. The warning says that the kernel will crash later. And it really
will only few lines below at:
tty->port->itty = tty;

So be nice and avoid the crash -- return an error instead. And update
the warning.

Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Cc: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
Link: https://lore.kernel.org/r/20191122101721.7222-1-jslaby@suse.cz


Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 1250ed71

drivers/tty/tty_io.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -1344,9 +1344,12 @@ struct tty_struct tty_init_dev(struct tty_driver driver, int idx)
		if (!tty->port)
		tty->port = driver->ports[idx];

		WARN_RATELIMIT(!tty->port,
		"%s: %s driver does not set tty->port. This will crash the kernel later. Fix the driver!\n",
		__func__, tty->driver->name);
		if (WARN_RATELIMIT(!tty->port,
		"%s: %s driver does not set tty->port. This would crash the kernel. Fix the driver!\n",
		__func__, tty->driver->name)) {
		retval = -EINVAL;
		goto err_release_lock;
		}

		retval = tty_ldisc_lock(tty, 5 * HZ);
		if (retval)

Admin message