Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8c051775 authored by Dave Hansen's avatar Dave Hansen Committed by Ingo Molnar
Browse files

x86/boot: Pass in size to early cmdline parsing 



We will use this in a few patches to implement tests for early parsing.

Signed-off-by: default avatarDave Hansen <dave.hansen@linux.intel.com>
[ Aligned args properly. ]
Signed-off-by: default avatarBorislav 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: default avatarIngo Molnar <mingo@kernel.org>
parent 4de07ea4

arch/x86/lib/cmdline.c

+9 −2
Original line number Diff line number Diff line
@@ -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);

}