[<prev] [next>] [day] [month] [year] [list]
Message-ID: <87a5b0800811200647i69360d29v8304e290c9fd9cf0@mail.gmail.com>
Date: Thu, 20 Nov 2008 14:47:26 +0000
From: "Will Newton" <will.newton@...il.com>
To: linux-kernel <linux-kernel@...r.kernel.org>
Cc: "Alan Cox" <alan@...rguk.ukuu.org.uk>
Subject: [PATCH] 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: Will Newton <will.newton@...il.com>
---
drivers/char/tty_io.c | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index 59f4721..1412a8d 100644
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -1795,12 +1795,15 @@ retry_open:
}
#endif
if (device == MKDEV(TTYAUX_MAJOR, 1)) {
- driver = tty_driver_kref_get(console_device(&index));
- if (driver) {
- /* Don't let /dev/console block */
- filp->f_flags |= O_NONBLOCK;
- noctty = 1;
- goto got_driver;
+ struct tty_driver *console_driver = console_device(&index);
+ if (console_driver) {
+ driver = tty_driver_kref_get(console_driver);
+ if (driver) {
+ /* Don't let /dev/console block */
+ filp->f_flags |= O_NONBLOCK;
+ noctty = 1;
+ goto got_driver;
+ }
}
mutex_unlock(&tty_mutex);
return -ENODEV;
--
1.5.5.2
View attachment "0001-drivers-char-tty_io.c-Avoid-panic-when-no-console-i.patch" of type "text/x-patch" (1251 bytes)
Powered by blists - more mailing lists