[patch 06/25] x86: io delay - add checking for NULL early param

[Greg KH]

2.6.26-stable review patch.  If anyone has any objections, please let us
know.

------------------

From: Cyrill Gorcunov <gorcunov@xxxxxxxxx>

[ Upstream commit d6cd7effcc5e0047faf15ab0a54c980f1a616a07 ]

Signed-off-by: Cyrill Gorcunov <gorcunov@xxxxxxxxx>
Cc: akpm@xxxxxxxxxxxxxxxxxxxx
Cc: andi@xxxxxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
CC: Oliver Pinter <oliver.pntr@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxx>

---
 arch/x86/kernel/io_delay.c |    3 +++
 1 file changed, 3 insertions(+)

--- a/arch/x86/kernel/io_delay.c
+++ b/arch/x86/kernel/io_delay.c
@@ -103,6 +103,9 @@ void __init io_delay_init(void)
 
 static int __init io_delay_param(char *s)
 {
+	if (!s)
+		return -EINVAL;
+
 	if (!strcmp(s, "0x80"))
 		io_delay_type = CONFIG_IO_DELAY_TYPE_0X80;
 	else if (!strcmp(s, "0xed"))

-- 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/