From: matt@codeblueprint.co.uk (Matt Fleming)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm64/efi: efi_init error handling fix
Date: Mon, 5 Sep 2016 14:57:23 +0100 [thread overview]
Message-ID: <20160905135723.GK32579@codeblueprint.co.uk> (raw)
In-Reply-To: <20160902102618.GC17482@arm.com>
On Fri, 02 Sep, at 11:26:18AM, Will Deacon wrote:
> On Fri, Sep 02, 2016 at 06:18:39PM +0800, Xie Yisheng wrote:
> > 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(-)
>
> Adding linux-efi, Ard and Matt. Please try to CC the relevant people in
> future.
>
> Will
>
> > 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;
> > + }
This should be a call to efi_memmap_unmap() because the EFI_MEMMAP
flag also needs clearing.
next prev parent reply other threads:[~2016-09-05 13:57 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-02 10:18 [PATCH] arm64/efi: efi_init error handling fix Xie Yisheng
2016-09-02 10:26 ` Will Deacon
2016-09-05 11:11 ` Yisheng Xie
2016-09-05 13:57 ` Matt Fleming [this message]
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=20160905135723.GK32579@codeblueprint.co.uk \
--to=matt@codeblueprint.co.uk \
--cc=linux-arm-kernel@lists.infradead.org \
/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).