lkml.org 
[lkml]   [2021]   [Nov]   [19]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.14 07/15] bootconfig: init: Fix memblock leak in xbc_make_cmdline()
    Date
    From: Masami Hiramatsu <mhiramat@kernel.org>

    commit 1ae43851b18afe861120ebd7c426dc44f06bb2bd 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: 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>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    init/main.c | 1 +
    1 file changed, 1 insertion(+)

    --- a/init/main.c
    +++ b/init/main.c
    @@ -382,6 +382,7 @@ static char * __init xbc_make_cmdline(co
    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;
    }


    \
     
     \ /
      Last update: 2021-11-19 18:40    [W:4.099 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site