| Message ID | 1472811519-4897-1-git-send-email-xieyisheng1@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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 >
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 >> > > . >
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.
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. > . >
On Wed, 07 Sep, at 07:15:48PM, Yisheng Xie wrote: > > > 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); This patch should be against the 'next' branch here, https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/log/?h=next My comments were made with that branch in mind.
On 2016/9/13 19:18, Matt Fleming wrote: > On Wed, 07 Sep, at 07:15:48PM, Yisheng Xie wrote: >> >> >> 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> >>>>> >>> >>> 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); > > This patch should be against the 'next' branch here, > > https://git.kernel.org/cgit/linux/kernel/git/mfleming/efi.git/log/?h=next > > My comments were made with that branch in mind. > Hi Matt, Sorry for my misunderstanding, I will try to rebase to next branch. Thanks. Yisheng Xie. > . >
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();