From: Daniel Kiper Date: Mon, 8 Oct 2018 12:28:55 +0000 (+0200) Subject: x86/boot: Allocate one extra module slot for Xen image placement X-Git-Tag: RELEASE-4.11.1~27 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a2e35a759249bd8b6ffeeebc0a3bc96d9cca2fba;p=people%2Fdwmw2%2Fxen.git x86/boot: Allocate one extra module slot for Xen image placement Commit 9589927 (x86/mb2: avoid Xen image when looking for module/crashkernel position) fixed relocation issues for Multiboot2 protocol. Unfortunately it missed to allocate module slot for Xen image placement in early boot path. So, let's fix it right now. Reported-by: Wei Liu Signed-off-by: Daniel Kiper Acked-by: Andrew Cooper master commit: 4c5f9dbebc0bd2afee1ecd936c74ffe65756950f master date: 2018-09-27 11:17:47 +0100 --- diff --git a/xen/arch/x86/boot/reloc.c b/xen/arch/x86/boot/reloc.c index a56ec77212..4f4039bb7c 100644 --- a/xen/arch/x86/boot/reloc.c +++ b/xen/arch/x86/boot/reloc.c @@ -177,7 +177,12 @@ static multiboot_info_t *mbi2_reloc(u32 mbi_in) if ( mbi_out->mods_count ) { mbi_out->flags |= MBI_MODULES; - mbi_out->mods_addr = alloc_mem(mbi_out->mods_count * sizeof(*mbi_out_mods)); + /* + * We have to allocate one more module slot here. At some point + * __start_xen() may put Xen image placement into it. + */ + mbi_out->mods_addr = alloc_mem((mbi_out->mods_count + 1) * + sizeof(*mbi_out_mods)); mbi_out_mods = _p(mbi_out->mods_addr); }