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 v3 2/3] bootconfig: init: Fix memblock leak in setup_boot_config()
Date: Wed, 15 Sep 2021 22:19:44 +0900 [thread overview]
Message-ID: <163171198422.590070.5414135296244084523.stgit@devnote2> (raw)
In-Reply-To: <163171196689.590070.15063104707696447188.stgit@devnote2>
Free unused memblock in a error case to fix memblock leak
in setup_boot_config().
Fixes: 7684b8582c24 ("bootconfig: Load boot config from the tail of initrd")
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 0b054fff8e92..4f059fde1df0 100644
--- a/init/main.c
+++ b/init/main.c
@@ -459,6 +459,7 @@ static void __init setup_boot_config(void)
else
pr_err("Failed to parse bootconfig: %s at %d.\n",
msg, pos);
+ memblock_free_ptr(copy, size + 1);
} else {
pr_info("Load bootconfig: %d bytes %d nodes\n", size, ret);
/* keys starting with "kernel." are passed via cmdline */
next prev parent reply other threads:[~2021-09-15 13:19 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-09-15 13:19 [PATCH v3 0/3] bootconfig: Fixes to bootconfig memory management Masami Hiramatsu
2021-09-15 13:19 ` [PATCH v3 1/3] bootconfig: init: Fix memblock leak in xbc_make_cmdline() Masami Hiramatsu
2021-09-15 13:19 ` Masami Hiramatsu [this message]
2021-09-15 13:19 ` [PATCH v3 3/3] bootconfig: Free xbc_data in xbc_destroy_all() Masami Hiramatsu
2021-09-15 14:23 ` Steven Rostedt
2021-09-16 0:05 ` Masami Hiramatsu
2021-09-16 0:17 ` Steven Rostedt
2021-09-15 16:47 ` [PATCH v3 0/3] bootconfig: Fixes to bootconfig memory management Linus Torvalds
2021-09-15 16:51 ` Linus Torvalds
2021-09-16 0:07 ` 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=163171198422.590070.5414135296244084523.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 \
/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
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox