bootconfig: init: Fix memblock leak in xbc_make_cmdline()

mhiramat · gregkh · commit f27060e28efc · 2021-11-21T13:46:35.000+01:00
commit 1ae4385 upstream. Free unused memblock in a error case to fix memblock leak in xbc_make_cmdline(). Link: https://lkml.kernel.org/r/163177339181.682366.8713781325929549256.stgit@devnote2 Fixes: 51887d0 ("bootconfig: init: Allow admin to use bootconfig for kernel command line") Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
diff --git a/init/main.c b/init/main.c
@@ -380,6 +380,7 @@ static char * __init xbc_make_cmdline(const char *key)
 	ret = xbc_snprint_cmdline(new_cmdline, len + 1, root);
 	if (ret < 0 || ret > len) {
 		pr_err("Failed to print extra kernel cmdline.\n");
+		memblock_free(__pa(new_cmdline), len + 1);
 		return NULL;
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -380,6 +380,7 @@ static char * __init xbc_make_cmdline(const char *key)`
`380`	`380`	`ret = xbc_snprint_cmdline(new_cmdline, len + 1, root);`
`381`	`381`	`if (ret < 0 \|\| ret > len) {`
`382`	`382`	`pr_err("Failed to print extra kernel cmdline.\n");`
	`383`	`+ memblock_free(__pa(new_cmdline), len + 1);`
`383`	`384`	`return NULL;`
`384`	`385`	`}`
`385`	`386`