[PATCH] arm64/efi: efi_init error handling fix

From	Xie Yisheng <xieyisheng1@huawei.com>
Newsgroups	linux.kernel
Subject	[PATCH] arm64/efi: efi_init error handling fix
Date	2016-09-02 12:30 +0200
Message-ID	<scTTs-6I4-9@gated-at.bofh.it> (permalink)
Organization	linux.* mail to news gateway

Show all headers | View raw

From: Yisheng Xie <xieyisheng1@huawei.com>

There's an early memmap leak in efi_init error path, fix it.

Signed-off-by: Yisheng Xie <xieyisheng1@huawei.com>
---
 drivers/firmware/efi/arm-init.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/firmware/efi/arm-init.c b/drivers/firmware/efi/arm-init.c
index c49d50e..5080e40 100644
--- a/drivers/firmware/efi/arm-init.c
+++ b/drivers/firmware/efi/arm-init.c
@@ -243,8 +243,10 @@ void __init efi_init(void)
 	     "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
 	      efi.memmap.desc_version);
 
-	if (uefi_init() < 0)
+	if (uefi_init() < 0) {
+		early_memunmap(efi.memmap.map, params.mmap_size);
 		return;
+	}
 
 	reserve_regions();
 	efi_memattr_init();
-- 
1.7.12.4

Back to linux.kernel | Previous | Next — Next in thread | Find similar | Unroll thread

Thread

[PATCH] arm64/efi: efi_init error handling fix Xie Yisheng <xieyisheng1@huawei.com> - 2016-09-02 12:30 +0200
  Re: [PATCH] arm64/efi: efi_init error handling fix Will Deacon <will.deacon@arm.com> - 2016-09-02 12:30 +0200
    Re: [PATCH] arm64/efi: efi_init error handling fix Yisheng Xie <xieyisheng1@huawei.com> - 2016-09-05 13:20 +0200
    Re: [PATCH] arm64/efi: efi_init error handling fix Matt Fleming <matt@codeblueprint.co.uk> - 2016-09-05 16:00 +0200
      Re: [PATCH] arm64/efi: efi_init error handling fix Yisheng Xie <xieyisheng1@huawei.com> - 2016-09-07 13:30 +0200

csiph-web