aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMilton Miller <miltonm@bga.com>2005-07-07 20:56:23 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-07 21:23:39 -0400
commit7805b1b29ffdd252dfef36aa28d7bda70cd586d3 (patch)
tree675b2300649b389eb4fb02ec298309e40d235d2c
parent64e4da57964c03da9a03087a398cade81b7bb496 (diff)
[PATCH] hvc_console: Add some sanity checks
Check if a vterm was registered before accepting it as a console. Check that a slot hasn't been probed with a tty in hvc_instantiate(). Check that a slot hasn't been free'ed when handing out console device. Signed-off-by: Milton Miller <miltonm@bga.com> Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r--drivers/char/hvc_console.c18
1 files changed, 18 insertions, 0 deletions
diff --git a/drivers/char/hvc_console.c b/drivers/char/hvc_console.c
index de849f571ea2..7bc65a76dfc4 100644
--- a/drivers/char/hvc_console.c
+++ b/drivers/char/hvc_console.c
@@ -192,12 +192,21 @@ void hvc_console_print(struct console *co, const char *b, unsigned count)
192 192
193static struct tty_driver *hvc_console_device(struct console *c, int *index) 193static struct tty_driver *hvc_console_device(struct console *c, int *index)
194{ 194{
195 if (vtermnos[c->index] == -1)
196 return NULL;
197
195 *index = c->index; 198 *index = c->index;
196 return hvc_driver; 199 return hvc_driver;
197} 200}
198 201
199static int __init hvc_console_setup(struct console *co, char *options) 202static int __init hvc_console_setup(struct console *co, char *options)
200{ 203{
204 if (co->index < 0 || co->index >= MAX_NR_HVC_CONSOLES)
205 return -ENODEV;
206
207 if (vtermnos[co->index] == -1)
208 return -ENODEV;
209
201 return 0; 210 return 0;
202} 211}
203 212
@@ -227,12 +236,21 @@ console_initcall(hvc_console_init);
227 */ 236 */
228int hvc_instantiate(uint32_t vtermno, int index) 237int hvc_instantiate(uint32_t vtermno, int index)
229{ 238{
239 struct hvc_struct *hp;
240
230 if (index < 0 || index >= MAX_NR_HVC_CONSOLES) 241 if (index < 0 || index >= MAX_NR_HVC_CONSOLES)
231 return -1; 242 return -1;
232 243
233 if (vtermnos[index] != -1) 244 if (vtermnos[index] != -1)
234 return -1; 245 return -1;
235 246
247 /* make sure no no tty has been registerd in this index */
248 hp = hvc_get_by_index(index);
249 if (hp) {
250 kobject_put(&hp->kobj);
251 return -1;
252 }
253
236 vtermnos[index] = vtermno; 254 vtermnos[index] = vtermno;
237 255
238 /* reserve all indices upto and including this index */ 256 /* reserve all indices upto and including this index */