Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1475014 > unrolled thread
| Started by | Xie Yisheng <xieyisheng1@huawei.com> |
|---|---|
| First post | 2016-09-02 12:30 +0200 |
| Last post | 2016-09-07 13:30 +0200 |
| Articles | 5 — 4 participants |
Back to article view | Back to linux.kernel
[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
| From | Xie Yisheng <xieyisheng1@huawei.com> |
|---|---|
| Date | 2016-09-02 12:30 +0200 |
| Subject | [PATCH] arm64/efi: efi_init error handling fix |
| Message-ID | <scTTs-6I4-9@gated-at.bofh.it> |
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
[toc] | [next] | [standalone]
| From | Will Deacon <will.deacon@arm.com> |
|---|---|
| Date | 2016-09-02 12:30 +0200 |
| Message-ID | <scTTs-6I4-7@gated-at.bofh.it> |
| In reply to | #1475014 |
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;
> + }
>
> reserve_regions();
> efi_memattr_init();
> --
> 1.7.12.4
>
[toc] | [prev] | [next] | [standalone]
| From | Yisheng Xie <xieyisheng1@huawei.com> |
|---|---|
| Date | 2016-09-05 13:20 +0200 |
| Message-ID | <se06t-31m-7@gated-at.bofh.it> |
| In reply to | #1475016 |
Hi all,
Could someone help to give some comments?
Really thanks for that.
Thanks.
Xie Yisheng
On 2016/9/2 18:26, 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.
>
Hi Will,
Thank you for your kind help. I will do more check about who to CC next time.
Thanks.
> 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;
>> + }
>>
>> reserve_regions();
>> efi_memattr_init();
>> --
>> 1.7.12.4
>>
>
> .
>
[toc] | [prev] | [next] | [standalone]
| From | Matt Fleming <matt@codeblueprint.co.uk> |
|---|---|
| Date | 2016-09-05 16:00 +0200 |
| Message-ID | <se2Bj-4t4-3@gated-at.bofh.it> |
| In reply to | #1475016 |
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.
[toc] | [prev] | [next] | [standalone]
| From | Yisheng Xie <xieyisheng1@huawei.com> |
|---|---|
| Date | 2016-09-07 13:30 +0200 |
| Message-ID | <seJdg-7vS-15@gated-at.bofh.it> |
| In reply to | #1476471 |
On 2016/9/5 21:57, Matt Fleming wrote:
> 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>
>>>
>>> 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.
>
Hi Matt,
Thanks for your reply.
You mean call the function efi_unmap_memmap() like x86?
however, it seems no need to clear EFI_MEMMAP here. For arm*, the flag
EFI_MEMMAP is set in function reserve_regions(), which is called
only when uefi_init() return 0:
efi_init()
-> reserve_regions()
-> set_bit(EFI_MEMMAP, &efi.flags);
Thanks
Xie Yisheng.
> .
>
[toc] | [prev] | [standalone]
Back to top | Article view | linux.kernel
csiph-web