lkml.org 
[lkml]   [2020]   [Feb]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: EFI boot crash regression (was: Re: 5.6-### doesn't boot)

* Ard Biesheuvel <ard.biesheuvel@linaro.org> wrote:

> Hello Jörg,
>
> Could you please try whether the change below fixes the issue?
>
> diff --git a/arch/x86/platform/efi/efi.c b/arch/x86/platform/efi/efi.c
> index 59f7f6d60cf6..ae923ee8e2b4 100644
> --- a/arch/x86/platform/efi/efi.c
> +++ b/arch/x86/platform/efi/efi.c
> @@ -308,7 +308,7 @@ static void __init efi_clean_memmap(void)
> .phys_map = efi.memmap.phys_map,
> .desc_version = efi.memmap.desc_version,
> .desc_size = efi.memmap.desc_size,
> - .size = data.desc_size * (efi.memmap.nr_map - n_removal),
> + .size = efi.memmap.desc_size * (efi.memmap.nr_map - n_removal),
> .flags = 0,

Oh, I actually noticed this one, but convinced myself that it's correct,
because GCC didn't warn about uninitialized data.

But maybe in this weird case data.desc_size as used within its own
initializer is zero?

Thanks,

Ingo

\
 
 \ /
  Last update: 2020-02-02 10:23    [W:0.076 / U:0.728 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site