tty/8250_early: Don't truncate last character of options

From: Henrik Nordstrom <[email protected]>
Date: Thu, 4 Jul 2013 03:24:41 +0200
Subject: [PATCH] tty/8250_early: Don't truncate last character of options

the 3,9 change to use strlcpy to save options uncovered a bug in the options argument length calculation causing last character of the string to be truncated by strlcpy. This caused the actual console to be configured with bad parameters when specifying the console using console=uart,... syntax.

Example:

Kernel command line: console=uart,mmio,0x90000000,115200 Early serial console at MMIO 0x90000000 (options '11520')

---
 drivers/tty/serial/8250/8250_early.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

index 721904f..946ddd2 100644
@@ -193,7 +193,8 @@ static int __init parse_options(struct early_serial8250_device *device,
 	if (options) {
 		options++;
 		device->baud = simple_strtoul(options, NULL, 0);
-		length = min(strcspn(options, " "), sizeof(device->options));
+		length = min(strcspn(options, " ") + 1,
+			     sizeof(device->options));
 		strlcpy(device->options, options, length);
 	} else {
 		device->baud = probe_baud(port);

1.8.3.1