leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
When no console is configured tty_open tries to call kref_get on a NULL
pointer, return ENODEV instead.

Signed-off-by: Will Newton <will.newton@gmail.com>
Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Will Newton 2008-12-01 11:36:06 +00:00 committed by Linus Torvalds
parent b4dcfbee3b
commit 296fa7f6a3
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/char/tty_io.c
View File

@ -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;