diff mbox series

arm64: kexec_file: fix memory leakage in create_dtb() when fdt_open_into() fails

Message ID 20210218125900.6810-1-qiuguorui1@huawei.com (mailing list archive)
State New, archived
Headers show
Series arm64: kexec_file: fix memory leakage in create_dtb() when fdt_open_into() fails | expand

Commit Message

qiuguorui1 Feb. 18, 2021, 12:59 p.m. UTC
in function create_dtb(), if fdt_open_into() fails, we need to vfree
buf before return.

Fixes: 52b2a8af74360 ("arm64: kexec_file: load initrd and device-tree")
Cc: stable@vger.kernel.org # v5.0
Signed-off-by: qiuguorui1 <qiuguorui1@huawei.com>
---
 arch/arm64/kernel/machine_kexec_file.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Comments

Will Deacon Feb. 19, 2021, 7:16 p.m. UTC | #1
On Thu, 18 Feb 2021 20:59:00 +0800, qiuguorui1 wrote:
> in function create_dtb(), if fdt_open_into() fails, we need to vfree
> buf before return.

Applied to arm64 (for-next/fixes), thanks!

[1/1] arm64: kexec_file: fix memory leakage in create_dtb() when fdt_open_into() fails
      https://git.kernel.org/arm64/c/656d1d58d8e0

Cheers,
diff mbox series

Patch

diff --git a/arch/arm64/kernel/machine_kexec_file.c b/arch/arm64/kernel/machine_kexec_file.c
index 03210f644790..0cde47a63beb 100644
--- a/arch/arm64/kernel/machine_kexec_file.c
+++ b/arch/arm64/kernel/machine_kexec_file.c
@@ -182,8 +182,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 = setup_dtb(image, initrd_load_addr, initrd_len,
 				cmdline, buf);