From: Masami Hiramatsu <[email protected]>
Commit de462e5f1071 ("bootconfig: Fix to remove bootconfig
data from initrd while boot") causes a cosmetic regression
on dmesg, which warns "no bootconfig data" message without
bootconfig cmdline option.
Fix setup_boot_config() by moving no bootconfig check after
commandline option check.
Link: http://lkml.kernel.org/r/[email protected]
Link: http://lkml.kernel.org/r/158916116468.21787.14558782332170588206.stgit@devnote2
Fixes: de462e5f1071 ("bootconfig: Fix to remove bootconfig data from initrd while boot")
Reported-by: Paul Menzel <[email protected]>
Signed-off-by: Masami Hiramatsu <[email protected]>
Signed-off-by: Steven Rostedt (VMware) <[email protected]>
---
init/main.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/init/main.c b/init/main.c
index 1a5da2c2660c..5803ecb411ab 100644
--- a/init/main.c
+++ b/init/main.c
@@ -400,9 +400,8 @@ static void __init setup_boot_config(const char *cmdline)
char *data, *copy;
int ret;
+ /* Cut out the bootconfig data even if we have no bootconfig option */
data = get_boot_config_from_initrd(&size, &csum);
- if (!data)
- goto not_found;
strlcpy(tmp_cmdline, boot_command_line, COMMAND_LINE_SIZE);
parse_args("bootconfig", tmp_cmdline, NULL, 0, 0, 0, NULL,
@@ -411,6 +410,11 @@ static void __init setup_boot_config(const char *cmdline)
if (!bootconfig_found)
return;
+ if (!data) {
+ pr_err("'bootconfig' found on command line, but no bootconfig found\n");
+ return;
+ }
+
if (size >= XBC_DATA_MAX) {
pr_err("bootconfig size %d greater than max size %d\n",
size, XBC_DATA_MAX);
@@ -446,8 +450,6 @@ static void __init setup_boot_config(const char *cmdline)
extra_init_args = xbc_make_cmdline("init");
}
return;
-not_found:
- pr_err("'bootconfig' found on command line, but no bootconfig found\n");
}
#else
--
2.26.2
Dear Steven,
Am 12.05.20 um 15:23 schrieb Steven Rostedt:
> From: Masami Hiramatsu <[email protected]>
>
> Commit de462e5f1071 ("bootconfig: Fix to remove bootconfig
> data from initrd while boot") causes a cosmetic regression
> on dmesg, which warns "no bootconfig data" message without
> bootconfig cmdline option.
>
> Fix setup_boot_config() by moving no bootconfig check after
> commandline option check.
>
> Link: http://lkml.kernel.org/r/[email protected]
> Link: http://lkml.kernel.org/r/158916116468.21787.14558782332170588206.stgit@devnote2
It’d be great if you could update your script to include HTTPS URLs.
That would save one redirect.
```
$ curl -I
http://lkml.kernel.org/r/[email protected]
HTTP/1.1 301 Moved Permanently
[ prevent LKML HTML mail detection ]
```
> Fixes: de462e5f1071 ("bootconfig: Fix to remove bootconfig data from initrd while boot")
> Reported-by: Paul Menzel <[email protected]>
> Signed-off-by: Masami Hiramatsu <[email protected]>
> Signed-off-by: Steven Rostedt (VMware) <[email protected]>
> ---
> init/main.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/init/main.c b/init/main.c
> index 1a5da2c2660c..5803ecb411ab 100644
> --- a/init/main.c
> +++ b/init/main.c
> @@ -400,9 +400,8 @@ static void __init setup_boot_config(const char *cmdline)
> char *data, *copy;
> int ret;
>
> + /* Cut out the bootconfig data even if we have no bootconfig option */
> data = get_boot_config_from_initrd(&size, &csum);
> - if (!data)
> - goto not_found;
>
> strlcpy(tmp_cmdline, boot_command_line, COMMAND_LINE_SIZE);
> parse_args("bootconfig", tmp_cmdline, NULL, 0, 0, 0, NULL,
> @@ -411,6 +410,11 @@ static void __init setup_boot_config(const char *cmdline)
> if (!bootconfig_found)
> return;
>
> + if (!data) {
> + pr_err("'bootconfig' found on command line, but no bootconfig found\n");
> + return;
> + }
> +
> if (size >= XBC_DATA_MAX) {
> pr_err("bootconfig size %d greater than max size %d\n",
> size, XBC_DATA_MAX);
> @@ -446,8 +450,6 @@ static void __init setup_boot_config(const char *cmdline)
> extra_init_args = xbc_make_cmdline("init");
> }
> return;
> -not_found:
> - pr_err("'bootconfig' found on command line, but no bootconfig found\n");
> }
>
> #else
Reviewed-by: Paul Menzel <[email protected]>
Kind regards,
Paul
On Tue, 12 May 2020 16:36:53 +0200
Paul Menzel <[email protected]> wrote:
> Dear Steven,
>
>
> Am 12.05.20 um 15:23 schrieb Steven Rostedt:
> > From: Masami Hiramatsu <[email protected]>
> >
> > Commit de462e5f1071 ("bootconfig: Fix to remove bootconfig
> > data from initrd while boot") causes a cosmetic regression
> > on dmesg, which warns "no bootconfig data" message without
> > bootconfig cmdline option.
> >
> > Fix setup_boot_config() by moving no bootconfig check after
> > commandline option check.
> >
> > Link: http://lkml.kernel.org/r/[email protected]
> > Link: http://lkml.kernel.org/r/158916116468.21787.14558782332170588206.stgit@devnote2
>
> It’d be great if you could update your script to include HTTPS URLs.
> That would save one redirect.
Never thought of that as an issue, but sure, it's easy enough to fix.
>
> Reviewed-by: Paul Menzel <[email protected]>
Thanks,
-- Steve