From: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
To: zohar@linux.ibm.com, bauerman@linux.ibm.com, robh@kernel.org,
takahiro.akashi@linaro.org, gregkh@linuxfoundation.org,
will@kernel.org, catalin.marinas@arm.com, mpe@ellerman.id.au
Cc: =james.morse@arm.com, sashal@kernel.org,
benh@kernel.crashing.org, paulus@samba.org,
frowand.list@gmail.com, vincenzo.frascino@arm.com,
mark.rutland@arm.com, dmitry.kasatkin@gmail.com,
jmorris@namei.org, serge@hallyn.com, pasha.tatashin@soleen.com,
allison@lohutok.net, masahiroy@kernel.org, bhsharma@redhat.com,
mbrugger@suse.com, hsinyi@chromium.org, tao.li@vivo.com,
christophe.leroy@c-s.fr, prsriva@linux.microsoft.com,
balajib@linux.microsoft.com, linux-integrity@vger.kernel.org,
linux-kernel@vger.kernel.org,
linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org
Subject: [PATCH v12 3/4] arm64: Free DTB buffer if fdt_open_into() fails
Date: Thu, 17 Dec 2020 09:37:07 -0800 [thread overview]
Message-ID: <20201217173708.6940-4-nramas@linux.microsoft.com> (raw)
In-Reply-To: <20201217173708.6940-1-nramas@linux.microsoft.com>
create_dtb() function allocates memory for the device tree blob (DTB)
and calls fdt_open_into(). If this call fails the memory allocated
for the DTB is not freed before returning from create_dtb() thereby
leaking memory.
Call vfree() to free the memory allocated for the DTB if fdt_open_into()
fails.
Signed-off-by: Lakshmi Ramasubramanian <nramas@linux.microsoft.com>
---
arch/arm64/kernel/machine_kexec_file.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index 7de9c47dee7c..3e045cd62451 100644
--- a/arch/arm64/kernel/machine_kexec_file.c
+++ b/arch/arm64/kernel/machine_kexec_file.c
@@ -65,8 +65,10 @@ static int create_dtb(struct kimage *image,
/* duplicate a device tree blob */
ret = fdt_open_into(initial_boot_params, buf, buf_size);
- if (ret)
+ if (ret) {
+ vfree(buf);
return -EINVAL;
+ }
ret = of_kexec_setup_new_fdt(image, buf, initrd_load_addr,
initrd_len, cmdline);
--
2.29.2
next prev parent reply other threads:[~2020-12-17 17:38 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-17 17:37 [PATCH v12 0/4] Carry forward IMA measurement log on kexec on ARM64 Lakshmi Ramasubramanian
2020-12-17 17:37 ` [PATCH v12 1/4] powerpc: Use fdt_appendprop_addrrange() to add ima buffer to FDT Lakshmi Ramasubramanian
2020-12-17 18:29 ` Lakshmi Ramasubramanian
2020-12-17 17:37 ` [PATCH v12 2/4] powerpc: Move arch independent ima kexec functions to drivers/of/kexec.c Lakshmi Ramasubramanian
2020-12-17 18:30 ` Lakshmi Ramasubramanian
2020-12-17 20:05 ` Rob Herring
2020-12-17 20:52 ` Lakshmi Ramasubramanian
2020-12-17 22:01 ` Rob Herring
2020-12-17 22:11 ` Lakshmi Ramasubramanian
2020-12-18 6:25 ` Lakshmi Ramasubramanian
2020-12-18 14:03 ` Rob Herring
2020-12-17 17:37 ` Lakshmi Ramasubramanian [this message]
2020-12-17 18:30 ` [PATCH v12 3/4] arm64: Free DTB buffer if fdt_open_into() fails Lakshmi Ramasubramanian
2020-12-17 17:37 ` [PATCH v12 4/4] arm64: Add IMA log information in kimage used for kexec Lakshmi Ramasubramanian
2020-12-17 18:31 ` Lakshmi Ramasubramanian
2020-12-17 18:12 ` [PATCH v12 0/4] Carry forward IMA measurement log on kexec on ARM64 Lakshmi Ramasubramanian
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=20201217173708.6940-4-nramas@linux.microsoft.com \
--to=nramas@linux.microsoft.com \
--cc==james.morse@arm.com \
--cc=allison@lohutok.net \
--cc=balajib@linux.microsoft.com \
--cc=bauerman@linux.ibm.com \
--cc=benh@kernel.crashing.org \
--cc=bhsharma@redhat.com \
--cc=catalin.marinas@arm.com \
--cc=christophe.leroy@c-s.fr \
--cc=devicetree@vger.kernel.org \
--cc=dmitry.kasatkin@gmail.com \
--cc=frowand.list@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=hsinyi@chromium.org \
--cc=jmorris@namei.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-integrity@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=masahiroy@kernel.org \
--cc=mbrugger@suse.com \
--cc=mpe@ellerman.id.au \
--cc=pasha.tatashin@soleen.com \
--cc=paulus@samba.org \
--cc=prsriva@linux.microsoft.com \
--cc=robh@kernel.org \
--cc=sashal@kernel.org \
--cc=serge@hallyn.com \
--cc=takahiro.akashi@linaro.org \
--cc=tao.li@vivo.com \
--cc=vincenzo.frascino@arm.com \
--cc=will@kernel.org \
--cc=zohar@linux.ibm.com \
/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).