On Wed, Nov 04, 2020 at 13:19:47 +0100, Ard Biesheuvel wrote:
> On Wed, 4 Nov 2020 at 13:11, Leif Lindholm <leif@xxxxxxxxxxxx> 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@xxxxxxx>
> > > ---
> > > 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
