diff --git a/[refs] b/[refs]
index 889c8f523cf0..4359e27da116 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 933b787b57ca8bdc0fc8fb2cbf67b5e6d21beb84
+refs/heads/master: 11c7da4b0ca76a57f51c996c883c480e203cf5a9
diff --git a/trunk/kernel/kexec.c b/trunk/kernel/kexec.c
index ae1c35201cc8..f336e2107f98 100644
--- a/trunk/kernel/kexec.c
+++ b/trunk/kernel/kexec.c
@@ -1228,7 +1228,7 @@ static int __init parse_crashkernel_mem(char 			*cmdline,
 	} while (*cur++ == ',');
 
 	if (*crash_size > 0) {
-		while (*cur != ' ' && *cur != '@')
+		while (*cur && *cur != ' ' && *cur != '@')
 			cur++;
 		if (*cur == '@') {
 			cur++;