bootconfig: init: Fix memblock leak in xbc_make_cmdline()
authorMasami Hiramatsu <mhiramat@kernel.org>
Thu, 16 Sep 2021 06:23:12 +0000 (15:23 +0900)
committerSteven Rostedt (VMware) <rostedt@goodmis.org>
Mon, 11 Oct 2021 02:27:40 +0000 (22:27 -0400)
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: 51887d03aca1 ("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>
init/main.c

index 81a79a7..3c4054a 100644 (file)
@@ -382,6 +382,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_ptr(new_cmdline, len + 1);
                return NULL;
        }