From ebc4b92fc0ce2f6b7662864190e733868a54e48d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Marczykowski-G=C3=B3recki?= Date: Thu, 14 Mar 2019 02:57:08 +0100 Subject: [PATCH] xen: Look for Xen notes in section headers too MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Daniel Kiper --- grub-core/loader/i386/xen_fileXX.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/grub-core/loader/i386/xen_fileXX.c b/grub-core/loader/i386/xen_fileXX.c index fb66e66fe..6329ec010 100644 --- a/grub-core/loader/i386/xen_fileXX.c +++ b/grub-core/loader/i386/xen_fileXX.c @@ -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)) {