From: Leif Lindholm <leif@nuviainc.com>
To: Ard Biesheuvel <ardb@kernel.org>
Cc: Ard Biesheuvel <ard.biesheuvel@arm.com>,
linux-efi <linux-efi@vger.kernel.org>,
The development of GNU GRUB <grub-devel@gnu.org>,
Daniel Kiper <daniel.kiper@oracle.com>
Subject: Re: [PATCH v2 1/8] linux/arm: fix ARM Linux header layout
Date: Wed, 4 Nov 2020 12:31:05 +0000 [thread overview]
Message-ID: <20201104123105.GU1664@vanye> (raw)
In-Reply-To: <CAMj1kXHfqcDpkPekm7jjgxi5KGCWnBTygrTgBoK2A74MZ6MvkQ@mail.gmail.com>
On Wed, Nov 04, 2020 at 13:19:47 +0100, Ard Biesheuvel wrote:
> On Wed, 4 Nov 2020 at 13:11, Leif Lindholm <leif@nuviainc.com> wrote:
> >
> > On Sun, Oct 25, 2020 at 14:49:34 +0100, Ard Biesheuvel wrote:
> > > The hdr_offset member of the ARM Linux image header appears at
> > > offset 0x3c, matching the PE/COFF spec's placement of the COFF
> > > header offset in the MS-DOS header. We're currently off by four,
> > > so fix that.
> > >
> > > Signed-off-by: Ard Biesheuvel <ard.biesheuvel@arm.com>
> > > ---
> > > include/grub/arm/linux.h | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/include/grub/arm/linux.h b/include/grub/arm/linux.h
> > > index 2e98a6689696..bcd5a7eb186e 100644
> > > --- a/include/grub/arm/linux.h
> > > +++ b/include/grub/arm/linux.h
> > > @@ -30,7 +30,7 @@ struct linux_arm_kernel_header {
> > > grub_uint32_t magic;
> > > grub_uint32_t start; /* _start */
> > > grub_uint32_t end; /* _edata */
> > > - grub_uint32_t reserved2[4];
> > > + grub_uint32_t reserved2[3];
> > > grub_uint32_t hdr_offset;
> >
> > How did this ever work?
> >
>
> By ignoring the value of hdr_offset entirely everywhere else
Oh, right - we only bother checking magic, doh!
/
Leif
next prev parent reply other threads:[~2020-11-04 12:31 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-25 13:49 [PATCH v2 0/8] linux: implement LoadFile2 initrd loading Ard Biesheuvel
2020-10-25 13:49 ` [PATCH v2 1/8] linux/arm: fix ARM Linux header layout Ard Biesheuvel
2020-11-04 12:11 ` Leif Lindholm
2020-11-04 12:19 ` Ard Biesheuvel
2020-11-04 12:31 ` Leif Lindholm [this message]
2021-03-11 16:18 ` Daniel Kiper
2020-10-25 13:49 ` [PATCH v2 2/8] loader/linux: permit NULL argument for argv[] in grub_initrd_load() Ard Biesheuvel
2020-10-25 13:49 ` [PATCH v2 3/8] efi: move MS-DOS stub out of generic PE header definition Ard Biesheuvel
2021-04-08 18:44 ` Heinrich Schuchardt
2021-04-09 6:10 ` Ard Biesheuvel
2021-04-09 6:29 ` Heinrich Schuchardt
2020-10-25 13:49 ` [PATCH v2 4/8] linux/arm: unify ARM/arm64 vs Xen PE/COFF header handling Ard Biesheuvel
2020-10-25 13:49 ` [PATCH v2 5/8] linux/arm: account for COFF headers appearing at unexpected offsets Ard Biesheuvel
2021-04-08 18:56 ` Heinrich Schuchardt
2021-04-09 6:12 ` Ard Biesheuvel
2021-04-09 6:40 ` Heinrich Schuchardt
2021-04-09 6:58 ` Ard Biesheuvel
2020-10-25 13:49 ` [PATCH v2 6/8] efi: add definition of LoadFile2 protocol Ard Biesheuvel
2020-10-25 13:49 ` [PATCH v2 7/8] efi: implement LoadFile2 initrd loading protocol for Linux Ard Biesheuvel
2020-10-26 21:37 ` Atish Patra
2020-10-26 22:00 ` Ard Biesheuvel
2020-10-25 13:49 ` [PATCH v2 8/8] linux: ignore FDT unless we need to modify it Ard Biesheuvel
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=20201104123105.GU1664@vanye \
--to=leif@nuviainc.com \
--cc=ard.biesheuvel@arm.com \
--cc=ardb@kernel.org \
--cc=daniel.kiper@oracle.com \
--cc=grub-devel@gnu.org \
--cc=linux-efi@vger.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