From: Anthony PERARD Date: Fri, 17 May 2019 11:38:43 +0000 (+0100) Subject: libxc: elf_kernel loader: Remove check for shstrtab X-Git-Tag: 4.13.0-rc1~919 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=582a298b215088acb042793da91f0baa8ce34425;p=xen.git libxc: elf_kernel loader: Remove check for shstrtab This was probably useful as a sanity check when the "__xen_guest" section were not legacy. But now ELF notes are prefered and "should live in a PT_NOTE segment" (elfnote.h). This check is unnecessary as elf_xen_parse() from xen/common/libelf will do the right thing and look for ELFNOTEs in the different places in order of preference. elf_xen_parse() will still be able to also look for the legacy "__xen_guest" section without the check in libxc. This patch would allow to write a simpler ELF header for an OVMF blob (which isn't an ELF) and allow it to be loaded as a PVH kernel. The header only needs to declare two program segments: - one to tell an ELF loader where to put the blob, - one for a Xen ELFNOTE. The ELFNOTE is to comply to the pvh design which wants the XEN_ELFNOTE_PHYS32_ENTRY to declare a blob as compaptible with the PVH boot ABI. Note that without the ELFNOTE, libxc will load an ELF but with the plain ELF loader, which doesn't check for shstrtab. Signed-off-by: Anthony PERARD Acked-by: Wei Liu Acked-by: Andrew Cooper --- diff --git a/tools/libxc/xc_dom_elfloader.c b/tools/libxc/xc_dom_elfloader.c index 82b5f2ee79..b327db219d 100644 --- a/tools/libxc/xc_dom_elfloader.c +++ b/tools/libxc/xc_dom_elfloader.c @@ -165,15 +165,6 @@ static elf_negerrnoval xc_dom_parse_elf_kernel(struct xc_dom_image *dom) return rc; } - /* Find the section-header strings table. */ - if ( ELF_PTRVAL_INVALID(elf->sec_strtab) ) - { - xc_dom_panic(dom->xch, XC_INVALID_KERNEL, "%s: ELF image" - " has no shstrtab", __FUNCTION__); - rc = -EINVAL; - goto out; - } - /* parse binary and get xen meta info */ elf_parse_binary(elf); if ( elf_xen_parse(elf, &dom->parms) != 0 )