Commit 296fa7f6 authored by Will Newton's avatar Will Newton Committed by Linus Torvalds

drivers/char/tty_io.c: Avoid panic when no console is configured.

When no console is configured tty_open tries to call kref_get on a NULL
pointer, return ENODEV instead.
Signed-off-by: default avatarWill Newton <will.newton@gmail.com>
Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent b4dcfbee
...@@ -1795,12 +1795,15 @@ retry_open: ...@@ -1795,12 +1795,15 @@ retry_open:
} }
#endif #endif
if (device == MKDEV(TTYAUX_MAJOR, 1)) { if (device == MKDEV(TTYAUX_MAJOR, 1)) {
driver = tty_driver_kref_get(console_device(&index)); struct tty_driver *console_driver = console_device(&index);
if (driver) { if (console_driver) {
/* Don't let /dev/console block */ driver = tty_driver_kref_get(console_driver);
filp->f_flags |= O_NONBLOCK; if (driver) {
noctty = 1; /* Don't let /dev/console block */
goto got_driver; filp->f_flags |= O_NONBLOCK;
noctty = 1;
goto got_driver;
}
} }
mutex_unlock(&tty_mutex); mutex_unlock(&tty_mutex);
return -ENODEV; return -ENODEV;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment