From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Sat, 5 Jul 2008 11:53:39 +0000 (+0400)
Subject: x86: e820 memmap - add checking for NULL early param
X-Git-Tag: v2.6.27-rc1~1106^2~47
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=a737abd11ac4eb9f4226fa8c9f1d9b5be12a96c1;p=linux-2.6-omap-h63xx.git

x86: e820 memmap - add checking for NULL early param

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: Cyrill Gorcunov <gorcunov@gmail.com>
Cc: akpm@linux-foundation.org
Cc: andi@firstfloor.org
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/arch/x86/kernel/e820.c b/arch/x86/kernel/e820.c
index 292ebc7fe4d..66fd5bd7831 100644
--- a/arch/x86/kernel/e820.c
+++ b/arch/x86/kernel/e820.c
@@ -1198,6 +1198,9 @@ static int __init parse_memmap_opt(char *p)
 	char *oldp;
 	u64 start_at, mem_size;
 
+	if (!p)
+		return -EINVAL;
+
 	if (!strcmp(p, "exactmap")) {
 #ifdef CONFIG_CRASH_DUMP
 		/*