[PATCH 3/8] efi/arm*: efi_init() error handling fix

[Matt Fleming]

From: Yisheng Xie <xieyishe...@huawei.com>

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

Signed-off-by: Yisheng Xie <xieyishe...@huawei.com>
Cc: Catalin Marinas <catalin.mari...@arm.com>
Cc: Mark Rutland <mark.rutl...@arm.com>
Cc: Will Deacon <will.dea...@arm.com>
Cc: Ingo Molnar <mi...@kernel.org>
Cc: Ard Biesheuvel <ard.biesheu...@linaro.org>
Signed-off-by: Matt Fleming <m...@codeblueprint.co.uk>
---
 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 8efe13075c92..f853ad2c4ca0 100644
--- a/drivers/firmware/efi/arm-init.c
+++ b/drivers/firmware/efi/arm-init.c
@@ -244,8 +244,10 @@ void __init efi_init(void)
             "Unexpected EFI_MEMORY_DESCRIPTOR version %ld",
              efi.memmap.desc_version);
 
-       if (uefi_init() < 0)
+       if (uefi_init() < 0) {
+               efi_memmap_unmap();
                return;
+       }
 
        reserve_regions();
        efi_memattr_init();
-- 
2.10.0