linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
To: Ben Hutchings <ben@decadent.org.uk>
Cc: "the arch/x86 maintainers" <x86@kernel.org>,
	Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
	linux-efi <linux-efi@vger.kernel.org>
Subject: Re: [PATCH] x86: boot: Fix EFI stub alignment
Date: Tue, 18 Sep 2018 15:04:54 -0700	[thread overview]
Message-ID: <CAKv+Gu8-u+Nfw0hx_iyMFFhG=-T0M_OuKfg34m1U3RgC13dUqA@mail.gmail.com> (raw)
In-Reply-To: <20180916152246.GG4765@decadent.org.uk>

On 16 September 2018 at 08:22, Ben Hutchings <ben@decadent.org.uk> wrote:
> We currently align the end of the compressed image to a multiple of
> 16.  However the PE-COFF header included in the EFI stub says that the
> file alignment is 32 bytes, and when adding an EFI signature to the
> file it must first be padded to this alignment.
>
> sbsigntool commands warn about this:
>
>     warning: file-aligned section .text extends beyond end of file
>     warning: checksum areas are greater than image size. Invalid section table?
>
> Worse, pesign-at least when creating a detached signature—uses the
> hash of the unpadded file, resulting in an invalid signature if
> padding is required.
>
> Avoid both these problems by increasing alignment to 32 bytes when
> CONFIG_EFI_STUB is enabled.
>
> Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
> ---

Thanks, queued in efi/next.


> --- a/arch/x86/boot/tools/build.c
> +++ b/arch/x86/boot/tools/build.c
> @@ -391,6 +391,13 @@ int main(int argc, char ** argv)
>                 die("Unable to mmap '%s': %m", argv[2]);
>         /* Number of 16-byte paragraphs, including space for a 4-byte CRC */
>         sys_size = (sz + 15 + 4) / 16;
> +#ifdef CONFIG_EFI_STUB
> +       /*
> +        * COFF requires minimum 32-byte alignment of sections, and
> +        * adding a signature is problematic without that alignment.
> +        */
> +       sys_size = (sys_size + 1) & ~1;
> +#endif
>
>         /* Patch the setup code with the appropriate size parameters */
>         buf[0x1f1] = setup_sectors-1;

      reply	other threads:[~2018-09-18 22:04 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-09-16 15:22 [PATCH] x86: boot: Fix EFI stub alignment Ben Hutchings
2018-09-18 22:04 ` Ard Biesheuvel [this message]

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='CAKv+Gu8-u+Nfw0hx_iyMFFhG=-T0M_OuKfg34m1U3RgC13dUqA@mail.gmail.com' \
    --to=ard.biesheuvel@linaro.org \
    --cc=ben@decadent.org.uk \
    --cc=linux-efi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=x86@kernel.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).