vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

xen: Look for Xen notes in section headers too

Browse source 
Mirror behaviour of ELF loader in libxc: first look for Xen notes in
PT_NOTE segment, then in SHT_NOTE section and only then fallback to
a section with __xen_guest name. This fixes loading PV kernels that
Xen note have outside of PT_NOTE. While this may be result of a buggy
linker script, loading such kernel directly works fine, so make it work
with GRUB too. Specifically, this applies to binaries built from Unikraft.

Signed-off-by: Marek Marczykowski-Górecki <marmarek@invisiblethingslab.com>
Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
This commit is contained in:
Marek Marczykowski-Górecki 2019-03-14 02:57:08 +01:00 committed by Daniel Kiper
parent 5dfa0afa16
commit 67580c0068
1 changed files with 17 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
grub-core/loader/i386/xen_fileXX.c
View file

@ -344,6 +344,23 @@ grub_xen_get_infoXX (grub_elf_t elf, struct grub_xen_file_info *xi)
s = (Elf_Shdr *) ((char *) s0 + elf->ehdr.ehdrXX.e_shstrndx * shentsize);
stroff = s->sh_offset;
for (s = s0; s < (Elf_Shdr *) ((char *) s0 + shnum * shentsize);
s = (Elf_Shdr *) ((char *) s + shentsize))
{
if (s->sh_type == SHT_NOTE)
{
err = parse_note (elf, xi, s->sh_offset, s->sh_size);
if (err)
goto cleanup;
}
}
if (xi->has_note)
{
err = GRUB_ERR_NONE;
goto cleanup;
}
for (s = s0; s < (Elf_Shdr *) ((char *) s0 + shnum * shentsize);
s = (Elf_Shdr *) ((char *) s + shentsize))
{