Regression with *bootconfig: Fix to remove bootconfig data from initrd while boot*

Regression with *bootconfig: Fix to remove bootconfig data from initrd while boot*

[Paul Menzel]

Dear Masami,


Commit de462e5f10 (bootconfig: Fix to remove bootconfig data from initrd 
while boot) causes a cosmetic regression on my x86 system with Debian 
Sid/unstable.

Despite having no `bootconfig` parameter on the Linux CLI, the warning 
below is shown.

     'bootconfig' found on command line, but no bootconfig found

Reverting the commit fixes it.


Kind regards,

Paul

Re: Regression with *bootconfig: Fix to remove bootconfig data from initrd while boot*

[Masami Hiramatsu]

On Sun, 10 May 2020 19:16:47 +0200
Paul Menzel <pmenzel@molgen.mpg.de> wrote:

> Dear Masami,
> 
> 
> Commit de462e5f10 (bootconfig: Fix to remove bootconfig data from initrd 
> while boot) causes a cosmetic regression on my x86 system with Debian 
> Sid/unstable.
> 
> Despite having no `bootconfig` parameter on the Linux CLI, the warning 
> below is shown.
> 
>      'bootconfig' found on command line, but no bootconfig found
> 
> Reverting the commit fixes it.

Oops, sorry about that.
I'll fix it soon.

Thanks!

-- 
Masami Hiramatsu <mhiramat@kernel.org>

[PATCH] bootconfig: Fix to prevent warning message if no bootconfig option

[Masami Hiramatsu]

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.

Fixes: de462e5f1071 ("bootconfig: Fix to remove bootconfig data from initrd while boot")
Reported-by: Paul Menzel <pmenzel@molgen.mpg.de>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
 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