* [PATCH v2] bootconfig: Fix to find the initargs correctly
@ 2020-08-04 2:52 Masami Hiramatsu
2020-08-04 20:59 ` Steven Rostedt
0 siblings, 1 reply; 4+ messages in thread
From: Masami Hiramatsu @ 2020-08-04 2:52 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Arvind Sankar, Masami Hiramatsu, linux-kernel
Since the parse_args() stops parsing at '--', bootconfig_params()
will never get the '--' as param and initargs_found never be true.
In the result, if we pass some init arguments via the bootconfig,
those are always appended to the kernel command line with '--'
even if the kernel command line already has '--'.
To fix this correctly, check the return value of parse_args()
and set initargs_found true if the return value is not an error
but a valid address.
Fixes: f61872bb58a1 ("bootconfig: Use parse_args() to find bootconfig and '--'")
Cc: stable@vger.kernel.org
Reported-by: Arvind Sankar <nivedita@alum.mit.edu>
Suggested-by: Arvind Sankar <nivedita@alum.mit.edu>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
Changes in v2:
- Remvoe unneede !IS_ERR().
---
init/main.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/init/main.c b/init/main.c
index 0ead83e86b5a..883ded3638e5 100644
--- a/init/main.c
+++ b/init/main.c
@@ -387,8 +387,6 @@ static int __init bootconfig_params(char *param, char *val,
{
if (strcmp(param, "bootconfig") == 0) {
bootconfig_found = true;
- } else if (strcmp(param, "--") == 0) {
- initargs_found = true;
}
return 0;
}
@@ -399,19 +397,23 @@ static void __init setup_boot_config(const char *cmdline)
const char *msg;
int pos;
u32 size, csum;
- char *data, *copy;
+ char *data, *copy, *err;
int ret;
/* Cut out the bootconfig data even if we have no bootconfig option */
data = get_boot_config_from_initrd(&size, &csum);
strlcpy(tmp_cmdline, boot_command_line, COMMAND_LINE_SIZE);
- parse_args("bootconfig", tmp_cmdline, NULL, 0, 0, 0, NULL,
- bootconfig_params);
+ err = parse_args("bootconfig", tmp_cmdline, NULL, 0, 0, 0, NULL,
+ bootconfig_params);
- if (!bootconfig_found)
+ if (IS_ERR(err) || !bootconfig_found)
return;
+ /* parse_args() stops at '--' and returns an address */
+ if (err)
+ initargs_found = true;
+
if (!data) {
pr_err("'bootconfig' found on command line, but no bootconfig found\n");
return;
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH v2] bootconfig: Fix to find the initargs correctly
2020-08-04 2:52 [PATCH v2] bootconfig: Fix to find the initargs correctly Masami Hiramatsu
@ 2020-08-04 20:59 ` Steven Rostedt
2020-08-05 7:41 ` Masami Hiramatsu
0 siblings, 1 reply; 4+ messages in thread
From: Steven Rostedt @ 2020-08-04 20:59 UTC (permalink / raw)
To: Masami Hiramatsu; +Cc: Arvind Sankar, linux-kernel
On Tue, 4 Aug 2020 11:52:13 +0900
Masami Hiramatsu <mhiramat@kernel.org> wrote:
> Since the parse_args() stops parsing at '--', bootconfig_params()
> will never get the '--' as param and initargs_found never be true.
> In the result, if we pass some init arguments via the bootconfig,
> those are always appended to the kernel command line with '--'
> even if the kernel command line already has '--'.
>
> To fix this correctly, check the return value of parse_args()
> and set initargs_found true if the return value is not an error
> but a valid address.
Thanks Masami,
I'll start testing this now. I just finished testing everything else I
had in my queue and pushed it to my for-next branch. Can you check to
see if I missed anything there?
-- Steve
>
> Fixes: f61872bb58a1 ("bootconfig: Use parse_args() to find bootconfig and '--'")
> Cc: stable@vger.kernel.org
> Reported-by: Arvind Sankar <nivedita@alum.mit.edu>
> Suggested-by: Arvind Sankar <nivedita@alum.mit.edu>
> Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
> ---
> Changes in v2:
> - Remvoe unneede !IS_ERR().
> ---
> init/main.c | 14 ++++++++------
> 1 file changed, 8 insertions(+), 6 deletions(-)
>
> diff --git a/init/main.c b/init/main.c
> index 0ead83e86b5a..883ded3638e5 100644
> --- a/init/main.c
> +++ b/init/main.c
> @@ -387,8 +387,6 @@ static int __init bootconfig_params(char *param, char *val,
> {
> if (strcmp(param, "bootconfig") == 0) {
> bootconfig_found = true;
> - } else if (strcmp(param, "--") == 0) {
> - initargs_found = true;
> }
> return 0;
> }
> @@ -399,19 +397,23 @@ static void __init setup_boot_config(const char *cmdline)
> const char *msg;
> int pos;
> u32 size, csum;
> - char *data, *copy;
> + char *data, *copy, *err;
> int ret;
>
> /* Cut out the bootconfig data even if we have no bootconfig option */
> data = get_boot_config_from_initrd(&size, &csum);
>
> strlcpy(tmp_cmdline, boot_command_line, COMMAND_LINE_SIZE);
> - parse_args("bootconfig", tmp_cmdline, NULL, 0, 0, 0, NULL,
> - bootconfig_params);
> + err = parse_args("bootconfig", tmp_cmdline, NULL, 0, 0, 0, NULL,
> + bootconfig_params);
>
> - if (!bootconfig_found)
> + if (IS_ERR(err) || !bootconfig_found)
> return;
>
> + /* parse_args() stops at '--' and returns an address */
> + if (err)
> + initargs_found = true;
> +
> if (!data) {
> pr_err("'bootconfig' found on command line, but no bootconfig found\n");
> return;
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH v2] bootconfig: Fix to find the initargs correctly
2020-08-04 20:59 ` Steven Rostedt
@ 2020-08-05 7:41 ` Masami Hiramatsu
0 siblings, 0 replies; 4+ messages in thread
From: Masami Hiramatsu @ 2020-08-05 7:41 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Arvind Sankar, linux-kernel
Hi Steve,
On Tue, 4 Aug 2020 16:59:29 -0400
Steven Rostedt <rostedt@goodmis.org> wrote:
> On Tue, 4 Aug 2020 11:52:13 +0900
> Masami Hiramatsu <mhiramat@kernel.org> wrote:
>
> > Since the parse_args() stops parsing at '--', bootconfig_params()
> > will never get the '--' as param and initargs_found never be true.
> > In the result, if we pass some init arguments via the bootconfig,
> > those are always appended to the kernel command line with '--'
> > even if the kernel command line already has '--'.
> >
> > To fix this correctly, check the return value of parse_args()
> > and set initargs_found true if the return value is not an error
> > but a valid address.
>
> Thanks Masami,
>
> I'll start testing this now. I just finished testing everything else I
> had in my queue and pushed it to my for-next branch. Can you check to
> see if I missed anything there?
Yeah, it seems all acked patches are picked up.
I'll move onto the next series.
Thank you!
>
> -- Steve
>
>
> >
> > Fixes: f61872bb58a1 ("bootconfig: Use parse_args() to find bootconfig and '--'")
> > Cc: stable@vger.kernel.org
> > Reported-by: Arvind Sankar <nivedita@alum.mit.edu>
> > Suggested-by: Arvind Sankar <nivedita@alum.mit.edu>
> > Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
> > ---
> > Changes in v2:
> > - Remvoe unneede !IS_ERR().
> > ---
> > init/main.c | 14 ++++++++------
> > 1 file changed, 8 insertions(+), 6 deletions(-)
> >
> > diff --git a/init/main.c b/init/main.c
> > index 0ead83e86b5a..883ded3638e5 100644
> > --- a/init/main.c
> > +++ b/init/main.c
> > @@ -387,8 +387,6 @@ static int __init bootconfig_params(char *param, char *val,
> > {
> > if (strcmp(param, "bootconfig") == 0) {
> > bootconfig_found = true;
> > - } else if (strcmp(param, "--") == 0) {
> > - initargs_found = true;
> > }
> > return 0;
> > }
> > @@ -399,19 +397,23 @@ static void __init setup_boot_config(const char *cmdline)
> > const char *msg;
> > int pos;
> > u32 size, csum;
> > - char *data, *copy;
> > + char *data, *copy, *err;
> > int ret;
> >
> > /* Cut out the bootconfig data even if we have no bootconfig option */
> > data = get_boot_config_from_initrd(&size, &csum);
> >
> > strlcpy(tmp_cmdline, boot_command_line, COMMAND_LINE_SIZE);
> > - parse_args("bootconfig", tmp_cmdline, NULL, 0, 0, 0, NULL,
> > - bootconfig_params);
> > + err = parse_args("bootconfig", tmp_cmdline, NULL, 0, 0, 0, NULL,
> > + bootconfig_params);
> >
> > - if (!bootconfig_found)
> > + if (IS_ERR(err) || !bootconfig_found)
> > return;
> >
> > + /* parse_args() stops at '--' and returns an address */
> > + if (err)
> > + initargs_found = true;
> > +
> > if (!data) {
> > pr_err("'bootconfig' found on command line, but no bootconfig found\n");
> > return;
>
--
Masami Hiramatsu <mhiramat@kernel.org>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] bootconfig: Fix to find the initargs correctly
@ 2020-08-04 2:51 Masami Hiramatsu
0 siblings, 0 replies; 4+ messages in thread
From: Masami Hiramatsu @ 2020-08-04 2:51 UTC (permalink / raw)
To: Steven Rostedt; +Cc: Arvind Sankar, Masami Hiramatsu, linux-kernel
Since the parse_args() stops parsing at '--', bootconfig_params()
will never get the '--' as param and initargs_found never be true.
In the result, if we pass some init arguments via the bootconfig,
those are always appended to the kernel command line with '--'
even if the kernel command line already has '--'.
To fix this correctly, check the return value of parse_args()
and set initargs_found true if the return value is not an error
but a valid address.
Fixes: f61872bb58a1 ("bootconfig: Use parse_args() to find bootconfig and '--'")
Cc: stable@vger.kernel.org
Reported-by: Arvind Sankar <nivedita@alum.mit.edu>
Suggested-by: Arvind Sankar <nivedita@alum.mit.edu>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
Changes in v2:
- Remvoe unneede !IS_ERR().
---
init/main.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/init/main.c b/init/main.c
index 0ead83e86b5a..883ded3638e5 100644
--- a/init/main.c
+++ b/init/main.c
@@ -387,8 +387,6 @@ static int __init bootconfig_params(char *param, char *val,
{
if (strcmp(param, "bootconfig") == 0) {
bootconfig_found = true;
- } else if (strcmp(param, "--") == 0) {
- initargs_found = true;
}
return 0;
}
@@ -399,19 +397,23 @@ static void __init setup_boot_config(const char *cmdline)
const char *msg;
int pos;
u32 size, csum;
- char *data, *copy;
+ char *data, *copy, *err;
int ret;
/* Cut out the bootconfig data even if we have no bootconfig option */
data = get_boot_config_from_initrd(&size, &csum);
strlcpy(tmp_cmdline, boot_command_line, COMMAND_LINE_SIZE);
- parse_args("bootconfig", tmp_cmdline, NULL, 0, 0, 0, NULL,
- bootconfig_params);
+ err = parse_args("bootconfig", tmp_cmdline, NULL, 0, 0, 0, NULL,
+ bootconfig_params);
- if (!bootconfig_found)
+ if (IS_ERR(err) || !bootconfig_found)
return;
+ /* parse_args() stops at '--' and returns an address */
+ if (err)
+ initargs_found = true;
+
if (!data) {
pr_err("'bootconfig' found on command line, but no bootconfig found\n");
return;
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-08-05 7:41 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-04 2:52 [PATCH v2] bootconfig: Fix to find the initargs correctly Masami Hiramatsu
2020-08-04 20:59 ` Steven Rostedt
2020-08-05 7:41 ` Masami Hiramatsu
-- strict thread matches above, loose matches on Subject: below --
2020-08-04 2:51 Masami Hiramatsu
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.