| Message ID | 20181017102012.872-2-fanc.fnst@cn.fujitsu.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
| Series | x86/boot/KASLR: Parse ACPI table and limit kaslr in immovable memory | expand |
On 10/17/18 at 06:20pm, Chao Fan wrote: > +bool cmdline_find_option_arg(const char *option, const char *arg, int argsize) > +{ > + char *buffer = malloc(argsize+1); > + bool find = false; > + int ret; > + > + ret = cmdline_find_option(option, buffer, argsize+1); > + if (ret == argsize && !strncmp(buffer, arg, argsize)) > + find = true; Wondering if we really need a wrapper like this. > + > + free(buffer); > + return find; > +} > > #endif > diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h > index a1d5918765f3..008fdc47a29c 100644 > --- a/arch/x86/boot/compressed/misc.h > +++ b/arch/x86/boot/compressed/misc.h > @@ -67,6 +67,7 @@ static inline void debug_puthex(const char *s) > /* cmdline.c */ > int cmdline_find_option(const char *option, char *buffer, int bufsize); > int cmdline_find_option_bool(const char *option); > +bool cmdline_find_option_arg(const char *option, const char *arg, int argsize); > #endif > > > -- > 2.17.2 > > >
On Thu, Oct 18, 2018 at 12:01:20PM +0800, Baoquan He wrote: >On 10/17/18 at 06:20pm, Chao Fan wrote: >> +bool cmdline_find_option_arg(const char *option, const char *arg, int argsize) >> +{ >> + char *buffer = malloc(argsize+1); >> + bool find = false; >> + int ret; >> + >> + ret = cmdline_find_option(option, buffer, argsize+1); >> + if (ret == argsize && !strncmp(buffer, arg, argsize)) >> + find = true; > >Wondering if we really need a wrapper like this. Well, my opinion is there are many code in kaslr.c can replaced by cmdline_find_option_bool() and cmdline_find_option() and this new cmdline_find_option_arg(). If this function introduced, we can clean up more code. Thanks, Chao Fan > >> + >> + free(buffer); >> + return find; >> +} >> >> #endif >> diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h >> index a1d5918765f3..008fdc47a29c 100644 >> --- a/arch/x86/boot/compressed/misc.h >> +++ b/arch/x86/boot/compressed/misc.h >> @@ -67,6 +67,7 @@ static inline void debug_puthex(const char *s) >> /* cmdline.c */ >> int cmdline_find_option(const char *option, char *buffer, int bufsize); >> int cmdline_find_option_bool(const char *option); >> +bool cmdline_find_option_arg(const char *option, const char *arg, int argsize); >> #endif >> >> >> -- >> 2.17.2 >> >> >> > >
diff --git a/arch/x86/boot/compressed/cmdline.c b/arch/x86/boot/compressed/cmdline.c index af6cda0b7900..61118c69feb8 100644 --- a/arch/x86/boot/compressed/cmdline.c +++ b/arch/x86/boot/compressed/cmdline.c @@ -1,5 +1,7 @@ // SPDX-License-Identifier: GPL-2.0 #include "misc.h" +#define STATIC +#include <linux/decompress/mm.h> #if CONFIG_EARLY_PRINTK || CONFIG_RANDOMIZE_BASE || CONFIG_X86_5LEVEL @@ -30,5 +32,18 @@ int cmdline_find_option_bool(const char *option) { return __cmdline_find_option_bool(get_cmd_line_ptr(), option); } +bool cmdline_find_option_arg(const char *option, const char *arg, int argsize) +{ + char *buffer = malloc(argsize+1); + bool find = false; + int ret; + + ret = cmdline_find_option(option, buffer, argsize+1); + if (ret == argsize && !strncmp(buffer, arg, argsize)) + find = true; + + free(buffer); + return find; +} #endif diff --git a/arch/x86/boot/compressed/misc.h b/arch/x86/boot/compressed/misc.h index a1d5918765f3..008fdc47a29c 100644 --- a/arch/x86/boot/compressed/misc.h +++ b/arch/x86/boot/compressed/misc.h @@ -67,6 +67,7 @@ static inline void debug_puthex(const char *s) /* cmdline.c */ int cmdline_find_option(const char *option, char *buffer, int bufsize); int cmdline_find_option_bool(const char *option); +bool cmdline_find_option_arg(const char *option, const char *arg, int argsize); #endif
Introduce a new function cmdline_find_option_arg() to detect whether option is in command line and the value is arg. Signed-off-by: Chao Fan <fanc.fnst@cn.fujitsu.com> --- arch/x86/boot/compressed/cmdline.c | 15 +++++++++++++++ arch/x86/boot/compressed/misc.h | 1 + 2 files changed, 16 insertions(+)