forked from Minki/linux
abcdc1c694
cmdline_find_option_bool() keeps track of position in two strings:
1. the command-line
2. the option we are searchign for in the command-line
We plow through each character in the command-line one at a time, always
moving forward. We move forward in the option ('opptr') when we match
characters in 'cmdline'. We reset the 'opptr' only when we go in to the
'st_wordstart' state.
But, if we fail to match an option because we see a space
(state=st_wordcmp, *opptr='\0',c=' '), we set state='st_wordskip' and
'break', moving to the next character. But, that move to the next
character is the one *after* the ' '. This means that we will miss a
'st_wordstart' state.
For instance, if we have
cmdline = "foo fool";
and are searching for "fool", we have:
"fool"
opptr = ----^
"foo fool"
c = --------^
We see that 'l' != ' ', set state=st_wordskip, break, and then move 'c', so:
"foo fool"
c = ---------^
and are still in state=st_wordskip. We will stay in wordskip until we
have skipped "fool", thus missing the option we were looking for. This
*only* happens when you have a partially- matching word followed by a
matching one.
To fix this, we always fall *into* the 'st_wordskip' state when we set
it.
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
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/20151222225239.8E1DCA58@viggo.jf.intel.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
107 lines
2.3 KiB
C
107 lines
2.3 KiB
C
/*
|
|
* This file is part of the Linux kernel, and is made available under
|
|
* the terms of the GNU General Public License version 2.
|
|
*
|
|
* Misc librarized functions for cmdline poking.
|
|
*/
|
|
#include <linux/kernel.h>
|
|
#include <linux/string.h>
|
|
#include <linux/ctype.h>
|
|
#include <asm/setup.h>
|
|
|
|
static inline int myisspace(u8 c)
|
|
{
|
|
return c <= ' '; /* Close enough approximation */
|
|
}
|
|
|
|
/**
|
|
* Find a boolean option (like quiet,noapic,nosmp....)
|
|
*
|
|
* @cmdline: the cmdline string
|
|
* @option: option string to look for
|
|
*
|
|
* Returns the position of that @option (starts counting with 1)
|
|
* or 0 on not found. @option will only be found if it is found
|
|
* 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)
|
|
{
|
|
char c;
|
|
int pos = 0, wstart = 0;
|
|
const char *opptr = NULL;
|
|
enum {
|
|
st_wordstart = 0, /* Start of word/after whitespace */
|
|
st_wordcmp, /* Comparing this word */
|
|
st_wordskip, /* Miscompare, skip */
|
|
} state = st_wordstart;
|
|
|
|
if (!cmdline)
|
|
return -1; /* No command line */
|
|
|
|
if (!strlen(cmdline))
|
|
return 0;
|
|
|
|
/*
|
|
* This 'pos' check ensures we do not overrun
|
|
* a non-NULL-terminated 'cmdline'
|
|
*/
|
|
while (pos < COMMAND_LINE_SIZE) {
|
|
c = *(char *)cmdline++;
|
|
pos++;
|
|
|
|
switch (state) {
|
|
case st_wordstart:
|
|
if (!c)
|
|
return 0;
|
|
else if (myisspace(c))
|
|
break;
|
|
|
|
state = st_wordcmp;
|
|
opptr = option;
|
|
wstart = pos;
|
|
/* fall through */
|
|
|
|
case st_wordcmp:
|
|
if (!*opptr) {
|
|
/*
|
|
* We matched all the way to the end of the
|
|
* option we were looking for. If the
|
|
* command-line has a space _or_ ends, then
|
|
* we matched!
|
|
*/
|
|
if (!c || myisspace(c))
|
|
return wstart;
|
|
/*
|
|
* We hit the end of the option, but _not_
|
|
* the end of a word on the cmdline. Not
|
|
* a match.
|
|
*/
|
|
} else if (!c) {
|
|
/*
|
|
* Hit the NULL terminator on the end of
|
|
* cmdline.
|
|
*/
|
|
return 0;
|
|
} else if (c == *opptr++) {
|
|
/*
|
|
* We are currently matching, so continue
|
|
* to the next character on the cmdline.
|
|
*/
|
|
break;
|
|
}
|
|
state = st_wordskip;
|
|
/* fall through */
|
|
|
|
case st_wordskip:
|
|
if (!c)
|
|
return 0;
|
|
else if (myisspace(c))
|
|
state = st_wordstart;
|
|
break;
|
|
}
|
|
}
|
|
|
|
return 0; /* Buffer overrun */
|
|
}
|