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: mark.rutland@arm•com, benh@kernel•crashing.org,
bhsharma@redhat•com, tao.li@vivo•com, paulus@samba•org,
vincenzo.frascino@arm•com, frowand.list@gmail•com,
sashal@kernel•org, masahiroy@kernel•org, jmorris@namei•org,
linux-arm-kernel@lists•infradead.org, serge@hallyn•com,
devicetree@vger•kernel.org, pasha.tatashin@soleen•com,
prsriva@linux•microsoft.com, hsinyi@chromium•org,
allison@lohutok•net, christophe.leroy@c-s•fr, mbrugger@suse•com,
balajib@linux•microsoft.com, dmitry.kasatkin@gmail•com,
linux-kernel@vger•kernel.org, james.morse@arm•com,
linux-integrity@vger•kernel.org
Subject: [PATCH v11 7/8] arm64: Free DTB buffer if fdt_open_into() fails
Date: Mon, 14 Dec 2020 11:18:53 -0800 [thread overview]
Message-ID: <20201214191854.9050-8-nramas@linux.microsoft.com> (raw)
In-Reply-To: <20201214191854.9050-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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists•infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2020-12-14 19:20 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-14 19:18 [PATCH v11 0/8] Carry forward IMA measurement log on kexec on ARM64 Lakshmi Ramasubramanian
2020-12-14 19:18 ` [PATCH v11 1/8] powerpc: Fix compiler warnings and errors Lakshmi Ramasubramanian
2020-12-14 19:18 ` [PATCH v11 2/8] powerpc: Move ima buffer functions to drivers/of/kexec.c Lakshmi Ramasubramanian
2020-12-15 18:16 ` Rob Herring
2020-12-16 16:58 ` Lakshmi Ramasubramanian
2020-12-14 19:18 ` [PATCH v11 3/8] powerpc: Use ima kexec node functions Lakshmi Ramasubramanian
2020-12-14 19:18 ` [PATCH v11 4/8] powerpc: Move remove_ima_buffer() to drivers/of/kexec.c Lakshmi Ramasubramanian
2020-12-14 19:18 ` [PATCH v11 5/8] powerpc: Move ima_get_kexec_buffer() and ima_free_kexec_buffer() to ima Lakshmi Ramasubramanian
2020-12-14 19:18 ` [PATCH v11 6/8] powerpc: Move arch_ima_add_kexec_buffer " Lakshmi Ramasubramanian
2020-12-14 19:18 ` Lakshmi Ramasubramanian [this message]
2020-12-14 19:18 ` [PATCH v11 8/8] arm64: Add IMA log information in kimage used for kexec 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=20201214191854.9050-8-nramas@linux.microsoft.com \
--to=nramas@linux$(echo .)microsoft.com \
--cc=allison@lohutok$(echo .)net \
--cc=balajib@linux$(echo .)microsoft.com \
--cc=bauerman@linux$(echo .)ibm.com \
--cc=benh@kernel$(echo .)crashing.org \
--cc=bhsharma@redhat$(echo .)com \
--cc=catalin.marinas@arm$(echo .)com \
--cc=christophe.leroy@c-s$(echo .)fr \
--cc=devicetree@vger$(echo .)kernel.org \
--cc=dmitry.kasatkin@gmail$(echo .)com \
--cc=frowand.list@gmail$(echo .)com \
--cc=gregkh@linuxfoundation$(echo .)org \
--cc=hsinyi@chromium$(echo .)org \
--cc=james.morse@arm$(echo .)com \
--cc=jmorris@namei$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
--cc=linux-integrity@vger$(echo .)kernel.org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=mark.rutland@arm$(echo .)com \
--cc=masahiroy@kernel$(echo .)org \
--cc=mbrugger@suse$(echo .)com \
--cc=mpe@ellerman$(echo .)id.au \
--cc=pasha.tatashin@soleen$(echo .)com \
--cc=paulus@samba$(echo .)org \
--cc=prsriva@linux$(echo .)microsoft.com \
--cc=robh@kernel$(echo .)org \
--cc=sashal@kernel$(echo .)org \
--cc=serge@hallyn$(echo .)com \
--cc=takahiro.akashi@linaro$(echo .)org \
--cc=tao.li@vivo$(echo .)com \
--cc=vincenzo.frascino@arm$(echo .)com \
--cc=will@kernel$(echo .)org \
--cc=zohar@linux$(echo .)ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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