summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorHidetoshi Seto <seto.hidetoshi@jp.fujitsu.com>2009-07-29 15:02:08 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-07-29 19:10:34 -0700
commit11c7da4b0ca76a57f51c996c883c480e203cf5a9 (patch)
tree25c816507896a6ec7b2a84c72e181080b6cc744d /kernel
parent933b787b57ca8bdc0fc8fb2cbf67b5e6d21beb84 (diff)
downloadlinux-stable-11c7da4b0ca76a57f51c996c883c480e203cf5a9.tar.gz
linux-stable-11c7da4b0ca76a57f51c996c883c480e203cf5a9.tar.bz2
linux-stable-11c7da4b0ca76a57f51c996c883c480e203cf5a9.zip
kexec: fix omitting offset in extended crashkernel syntax
Setting "crashkernel=512M-2G:64M,2G-:128M" does not work but it turns to work if it has a trailing-whitespace, like "crashkernel=512M-2G:64M,2G-:128M ". It was because of a bug in the parser, running over the cmdline. This patch adds a check of the termination. Reported-by: Jin Dongming <jin.dongming@np.css.fujitsu.com> Signed-off-by: Hidetoshi Seto <seto.hidetoshi@jp.fujitsu.com> Tested-by: Jin Dongming <jin.dongming@np.css.fujitsu.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/kexec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/kexec.c b/kernel/kexec.c
index ae1c35201cc8..f336e2107f98 100644
--- a/kernel/kexec.c
+++ b/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++;