From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
stable@vger.kernel.org, Masami Hiramatsu <mhiramat@kernel.org>,
"Steven Rostedt (VMware)" <rostedt@goodmis.org>
Subject: [PATCH 5.14 07/15] bootconfig: init: Fix memblock leak in xbc_make_cmdline()
Date: Fri, 19 Nov 2021 18:38:40 +0100 [thread overview]
Message-ID: <20211119171443.956005694@linuxfoundation.org> (raw)
In-Reply-To: <20211119171443.724340448@linuxfoundation.org>
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;
}
next prev parent reply other threads:[~2021-11-19 17:39 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-19 17:38 [PATCH 5.14 00/15] 5.14.21-rc1 review Greg Kroah-Hartman
2021-11-19 17:38 ` [PATCH 5.14 01/15] Revert "drm: fb_helper: improve CONFIG_FB dependency" Greg Kroah-Hartman
2021-11-19 17:38 ` [PATCH 5.14 02/15] Revert "drm: fb_helper: fix " Greg Kroah-Hartman
2021-11-19 17:38 ` [PATCH 5.14 03/15] KVM: Fix steal time asm constraints Greg Kroah-Hartman
2021-11-19 17:38 ` [PATCH 5.14 04/15] fortify: Explicitly disable Clang support Greg Kroah-Hartman
2021-11-19 17:38 ` [PATCH 5.14 05/15] block: Add a helper to validate the block size Greg Kroah-Hartman
2021-11-19 17:38 ` [PATCH 5.14 06/15] loop: Use blk_validate_block_size() to validate " Greg Kroah-Hartman
2021-11-19 17:38 ` Greg Kroah-Hartman [this message]
2021-11-19 17:38 ` [PATCH 5.14 08/15] Bluetooth: btusb: Add support for TP-Link UB500 Adapter Greg Kroah-Hartman
2021-11-19 17:38 ` [PATCH 5.14 09/15] parisc/entry: fix trace test in syscall exit path Greg Kroah-Hartman
2021-11-19 17:38 ` [PATCH 5.14 10/15] PCI/MSI: Destroy sysfs before freeing entries Greg Kroah-Hartman
2021-11-19 17:38 ` [PATCH 5.14 11/15] PCI/MSI: Deal with devices lying about their MSI mask capability Greg Kroah-Hartman
2021-11-19 17:38 ` [PATCH 5.14 12/15] PCI: Add MSI masking quirk for Nvidia ION AHCI Greg Kroah-Hartman
2021-11-19 17:38 ` [PATCH 5.14 13/15] perf/core: Avoid put_page() when GUP fails Greg Kroah-Hartman
2021-11-19 17:38 ` [PATCH 5.14 14/15] thermal: Fix NULL pointer dereferences in of_thermal_ functions Greg Kroah-Hartman
2021-11-19 17:38 ` [PATCH 5.14 15/15] Revert "ACPI: scan: Release PM resources blocked by unused objects" Greg Kroah-Hartman
2021-11-19 19:02 ` [PATCH 5.14 00/15] 5.14.21-rc1 review Florian Fainelli
2021-11-19 23:18 ` Shuah Khan
2021-11-19 23:57 ` Fox Chen
2021-11-20 4:40 ` Daniel Díaz
2021-11-20 16:52 ` Guenter Roeck
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=20211119171443.956005694@linuxfoundation.org \
--to=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=rostedt@goodmis.org \
--cc=stable@vger.kernel.org \
/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).