Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
DMARC-Filter: OpenDMARC Filter v1.3.2 smtp.codeaurora.org DD03960848
From:   Tyler Baicar <tbaicar@codeaurora.org>
To:     ard.biesheuvel@linaro.org, linux-efi@vger.kernel.org,
        linux-kernel@vger.kernel.org, jhugo@codeaurora.org,
        sgoel@codeaurora.org, takahiro.akashi@linaro.org,
        timur@codeaurora.org
Cc:     Tyler Baicar <tbaicar@codeaurora.org>
Subject: [PATCH 1/2] efi/esrt: fix unsupported version initialization failure
Date:   Fri, 23 Feb 2018 12:42:32 -0700
Message-Id: <1519414953-5478-2-git-send-email-tbaicar@codeaurora.org>
In-Reply-To: <1519414953-5478-1-git-send-email-tbaicar@codeaurora.org>
References: <1519414953-5478-1-git-send-email-tbaicar@codeaurora.org>
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

If ESRT initialization fails due to an unsupported version, the
early_memremap allocation is never unmapped. This will cause an
early ioremap leak. So, make sure to unmap the memory allocation
before returning from efi_esrt_init().

Signed-off-by: Tyler Baicar <tbaicar@codeaurora.org>
---
 drivers/firmware/efi/esrt.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/firmware/efi/esrt.c b/drivers/firmware/efi/esrt.c
index c47e0c6..504f3c3 100644
--- a/drivers/firmware/efi/esrt.c
+++ b/drivers/firmware/efi/esrt.c
@@ -285,7 +285,7 @@ void __init efi_esrt_init(void)
 	} else {
 		pr_err("Unsupported ESRT version %lld.\n",
 		       tmpesrt.fw_resource_version);
-		return;
+		goto err_memunmap;
 	}
 
 	if (tmpesrt.fw_resource_count > 0 && max - size < entry_size) {
-- 
Qualcomm Datacenter Technologies, Inc. as an affiliate of Qualcomm Technologies, Inc.
Qualcomm Technologies, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project.