From: qiuguorui1 <qiuguorui1@huawei.com>

Date: Thu, 18 Feb 2021 20:59:00 +0800

Subject: arm64: kexec_file: fix memory leakage in create_dtb() when

 fdt_open_into() fails

Git-commit: 656d1d58d8e0958d372db86c24f0b2ea36f50888

Patch-mainline: v5.12-rc1

References: git-fixes

in function create_dtb(), if fdt_open_into() fails, we need to vfree

buf before return.

Fixes: 52b2a8af7436 ("arm64: kexec_file: load initrd and device-tree")

Cc: stable@vger.kernel.org # v5.0

Signed-off-by: qiuguorui1 <qiuguorui1@huawei.com>

Link: https://lore.kernel.org/r/20210218125900.6810-1-qiuguorui1@huawei.com

Signed-off-by: Will Deacon <will@kernel.org>

Signed-off-by: Mian Yousaf Kaukab <ykaukab@suse.de>

---

 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 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);

-- 

2.26.2