LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Masami Hiramatsu <mhiramat@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
	Mike Rapoport <rppt@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	LKML <linux-kernel@vger.kernel.org>,
	Ingo Molnar <mingo@kernel.org>,
	Masami Hiramatsu <mhiramat@kernel.org>,
	Linux-MM <linux-mm@kvack.org>, Vlastimil Babka <vbabka@suse.cz>
Subject: [PATCH v2 2/5] bootconfig: init: Fix memblock leak in xbc_make_cmdline()
Date: Wed, 15 Sep 2021 09:53:14 +0900	[thread overview]
Message-ID: <163166719378.510331.1159980452908668023.stgit@devnote2> (raw)
In-Reply-To: <163166717752.510331.12843735095061762373.stgit@devnote2>

Free unused memblock in a error case to fix memblock leak
in xbc_make_cmdline().

Fixes: 51887d03aca1 ("bootconfig: init: Allow admin to use bootconfig for kernel command line")
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
 init/main.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/init/main.c b/init/main.c
index 3f7216934441..0b054fff8e92 100644
--- a/init/main.c
+++ b/init/main.c
@@ -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;
 	}
 


  parent reply	other threads:[~2021-09-15  0:53 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-15  0:52 [PATCH v2 0/5] bootconfig: Fixes to bootconfig memory management Masami Hiramatsu
2021-09-15  0:53 ` [PATCH v2 1/5] bootconfig: Fix to check the xbc_node is used before free it Masami Hiramatsu
2021-09-15  1:12   ` Linus Torvalds
2021-09-15  1:44     ` Masami Hiramatsu
2021-09-15  0:53 ` Masami Hiramatsu [this message]
2021-09-15  0:53 ` [PATCH v2 3/5] bootconfig: init: Fix memblock leak in setup_boot_config() Masami Hiramatsu
2021-09-15  0:53 ` [PATCH v2 4/5] bootconfig: Free copied bootconfig data after boot Masami Hiramatsu
2021-09-15  1:13   ` Linus Torvalds
2021-09-15  1:45     ` Masami Hiramatsu
2021-09-15  0:53 ` [PATCH v2 5/5] tools/bootconfig: Define memblock_free_ptr() to fix build error Masami Hiramatsu
2021-09-15  1:21   ` Linus Torvalds
2021-09-15  1:47     ` Masami Hiramatsu
2021-09-15  1:57       ` Linus Torvalds
2021-09-15  3:00         ` Masami Hiramatsu

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=163166719378.510331.1159980452908668023.stgit@devnote2 \
    --to=mhiramat@kernel.org \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=mingo@kernel.org \
    --cc=rostedt@goodmis.org \
    --cc=rppt@kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=vbabka@suse.cz \
    --subject='Re: [PATCH v2 2/5] bootconfig: init: Fix memblock leak in xbc_make_cmdline()' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).