Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <1642608867-21307-1-git-send-email-mihai.carabas@oracle.com>
In-Reply-To: <1642608867-21307-1-git-send-email-mihai.carabas@oracle.com>
From:   Ard Biesheuvel <ardb@kernel.org>
Date:   Wed, 19 Jan 2022 18:22:48 +0100
Message-ID: <CAMj1kXG14Tx41JZ1NZXkJVTSai++eb-zfv1Dk5dP1QDoDkDFEQ@mail.gmail.com>
Subject: Re: [PATCH] efi/libstub: arm64: Fix image check alignment at entry
To:     Mihai Carabas <mihai.carabas@oracle.com>
Cc:     linux-efi <linux-efi@vger.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Wed, 19 Jan 2022 at 18:10, Mihai Carabas <mihai.carabas@oracle.com> wrote:
>
> The kernel is aligned at SEGMENT_SIZE and this is the size populated in the PE
> headers:
>
> arch/arm64/kernel/efi-header.S: .long   SEGMENT_ALIGN // SectionAlignment
>
> EFI_KIMG_ALIGN is defined as: (SEGMENT_ALIGN > THREAD_ALIGN ? SEGMENT_ALIGN :
> THREAD_ALIGN)
>
> So it depends on THREAD_ALIGN. On newer builds this message started to appear
> even though the loader is taking into account the PE header (which is stating
> SEGMENT_ALIGN).
>
> Fixes: c32ac11da3f8 ("efi/libstub: arm64: Double check image alignment at entry")
> Signed-off-by: Mihai Carabas <mihai.carabas@oracle.com>

Thanks. I'll queue this up as a fix.

> ---
>  drivers/firmware/efi/libstub/arm64-stub.c | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/drivers/firmware/efi/libstub/arm64-stub.c b/drivers/firmware/efi/libstub/arm64-stub.c
> index 2363fee9211c..9cc556013d08 100644
> --- a/drivers/firmware/efi/libstub/arm64-stub.c
> +++ b/drivers/firmware/efi/libstub/arm64-stub.c
> @@ -119,9 +119,9 @@ efi_status_t handle_kernel_image(unsigned long *image_addr,
>         if (image->image_base != _text)
>                 efi_err("FIRMWARE BUG: efi_loaded_image_t::image_base has bogus value\n");
>
> -       if (!IS_ALIGNED((u64)_text, EFI_KIMG_ALIGN))
> -               efi_err("FIRMWARE BUG: kernel image not aligned on %ldk boundary\n",
> -                       EFI_KIMG_ALIGN >> 10);
> +       if (!IS_ALIGNED((u64)_text, SEGMENT_ALIGN))
> +               efi_err("FIRMWARE BUG: kernel image not aligned on %dk boundary\n",
> +                       SEGMENT_ALIGN >> 10);
>
>         kernel_size = _edata - _text;
>         kernel_memsize = kernel_size + (_end - _edata);
> --
> 1.8.3.1
>