| From: Dave Hansen <dave.hansen@linux.intel.com> |
| Date: Tue, 22 Dec 2015 14:52:43 -0800 |
| Subject: x86/boot: Pass in size to early cmdline parsing |
| |
| commit 8c0517759a1a100a8b83134cf3c7f254774aaeba upstream. |
| |
| We will use this in a few patches to implement tests for early parsing. |
| |
| Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com> |
| [ Aligned args properly. ] |
| Signed-off-by: Borislav Petkov <bp@suse.de> |
| Cc: Andy Lutomirski <luto@amacapital.net> |
| Cc: Borislav Petkov <bp@alien8.de> |
| Cc: Brian Gerst <brgerst@gmail.com> |
| Cc: Denys Vlasenko <dvlasenk@redhat.com> |
| Cc: H. Peter Anvin <hpa@zytor.com> |
| Cc: Linus Torvalds <torvalds@linux-foundation.org> |
| Cc: Peter Zijlstra <peterz@infradead.org> |
| Cc: Thomas Gleixner <tglx@linutronix.de> |
| Cc: fenghua.yu@intel.com |
| Cc: yu-cheng.yu@intel.com |
| Link: http://lkml.kernel.org/r/20151222225243.5CC47EB6@viggo.jf.intel.com |
| Signed-off-by: Ingo Molnar <mingo@kernel.org> |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| arch/x86/lib/cmdline.c | 11 +++++++++-- |
| 1 file changed, 9 insertions(+), 2 deletions(-) |
| |
| diff --git a/arch/x86/lib/cmdline.c b/arch/x86/lib/cmdline.c |
| index 945a639c02dd..5cc78bf57232 100644 |
| --- a/arch/x86/lib/cmdline.c |
| +++ b/arch/x86/lib/cmdline.c |
| @@ -25,7 +25,9 @@ static inline int myisspace(u8 c) |
| * as an entire word in @cmdline. For instance, if @option="car" |
| * then a cmdline which contains "cart" will not match. |
| */ |
| -int cmdline_find_option_bool(const char *cmdline, const char *option) |
| +static int |
| +__cmdline_find_option_bool(const char *cmdline, int max_cmdline_size, |
| + const char *option) |
| { |
| char c; |
| int pos = 0, wstart = 0; |
| @@ -43,7 +45,7 @@ int cmdline_find_option_bool(const char *cmdline, const char *option) |
| * This 'pos' check ensures we do not overrun |
| * a non-NULL-terminated 'cmdline' |
| */ |
| - while (pos < COMMAND_LINE_SIZE) { |
| + while (pos < max_cmdline_size) { |
| c = *(char *)cmdline++; |
| pos++; |
| |
| @@ -101,3 +103,8 @@ int cmdline_find_option_bool(const char *cmdline, const char *option) |
| |
| return 0; /* Buffer overrun */ |
| } |
| + |
| +int cmdline_find_option_bool(const char *cmdline, const char *option) |
| +{ |
| + return __cmdline_find_option_bool(cmdline, COMMAND_LINE_SIZE, option); |
| +} |
| |