aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric W. Biederman <ebiederm@xmission.com>2008-07-12 21:40:32 +0000
committerGreg Kroah-Hartman <gregkh@suse.de>2008-07-24 09:14:09 -0700
commit57dc6158b397beba881fa405cbafcfb99b57dd5e (patch)
tree3f2b3df785c2f6b734d3eb6750b4ae4449133b07
parent94db799b920539daf593ab48365ee0d71ce3dbf7 (diff)
serial8250: sanity check nr_uarts on all paths.
commit 05d81d2222beec7b63ac8c1c8cdb5bb4f82c2bad upstream I had 8250.nr_uarts=16 in the boot line of a test kernel and I had a weird mysterious crash in sysfs. After taking an in-depth look I realized that CONFIG_SERIAL_8250_NR_UARTS was set to 4 and I was walking off the end of the serial8250_ports array. Ouch!!! Don't let this happen to someone else. Signed-off-by: Eric W. Biederman <ebiederm@xmission.com> Acked-by: Alan Cox <alan@redhat.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/serial/8250.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index d60705e9d007..fe989c5cd3f8 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -2564,6 +2564,9 @@ static struct console serial8250_console = {
static int __init serial8250_console_init(void)
{
+ if (nr_uarts > UART_NR)
+ nr_uarts = UART_NR;
+
serial8250_isa_init_ports();
register_console(&serial8250_console);
return 0;