From: Xie Yisheng <xieyisheng1@huawei.com>
To: <mingo@kernel.org>
Cc: <guohanjun@huawei.com>, <mark.rutland@arm.com>,
<will.deacon@arm.com>, <catalin.marinas@arm.com>,
<linux-kernel@vger.kernel.org>,
<linux-arm-kernel@lists.infradead.org>
Subject: [PATCH] arm64/efi: efi_init error handling fix
Date: Fri, 2 Sep 2016 18:18:39 +0800 [thread overview]
Message-ID: <1472811519-4897-1-git-send-email-xieyisheng1@huawei.com> (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
next reply other threads:[~2016-09-02 10:21 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-02 10:18 Xie Yisheng [this message]
2016-09-02 10:26 ` [PATCH] arm64/efi: efi_init error handling fix Will Deacon
2016-09-05 11:11 ` Yisheng Xie
2016-09-05 13:57 ` Matt Fleming
2016-09-07 11:15 ` Yisheng Xie
2016-09-13 11:18 ` Matt Fleming
2016-09-19 12:29 ` Yisheng Xie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1472811519-4897-1-git-send-email-xieyisheng1@huawei.com \
--to=xieyisheng1@huawei.com \
--cc=catalin.marinas@arm.com \
--cc=guohanjun@huawei.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@kernel.org \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).