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 3/3] bootconfig: Free xbc_data in xbc_destroy_all()
Date: Wed, 15 Sep 2021 22:19:52 +0900 [thread overview]
Message-ID: <163171199244.590070.6356174550728998874.stgit@devnote2> (raw)
In-Reply-To: <163171196689.590070.15063104707696447188.stgit@devnote2>
Free xbc_data memory in xbc_destroy_all() with other data.
Note that this changes the ownership of the passed bootconfig
data.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
lib/bootconfig.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/lib/bootconfig.c b/lib/bootconfig.c
index 5ae248b29373..2ba7d945adc9 100644
--- a/lib/bootconfig.c
+++ b/lib/bootconfig.c
@@ -789,6 +789,7 @@ static int __init xbc_verify_tree(void)
*/
void __init xbc_destroy_all(void)
{
+ memblock_free_ptr(xbc_data, xbc_data_size);
xbc_data = NULL;
xbc_data_size = 0;
xbc_node_num = 0;
@@ -810,6 +811,8 @@ void __init xbc_destroy_all(void)
* In error cases, @emsg will be updated with an error message and
* @epos will be updated with the error position which is the byte offset
* of @buf. If the error is not a parser error, @epos will be -1.
+ * Note that the @buf ownership is transferred, so it will be freed
+ * in xbc_destroy_all().
*/
int __init xbc_init(char *buf, const char **emsg, int *epos)
{
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 ` [PATCH v3 2/3] bootconfig: init: Fix memblock leak in setup_boot_config() Masami Hiramatsu
2021-09-15 13:19 ` Masami Hiramatsu [this message]
2021-09-15 14:23 ` [PATCH v3 3/3] bootconfig: Free xbc_data in xbc_destroy_all() 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=163171199244.590070.6356174550728998874.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;
as well as URLs for NNTP newsgroup(s).