[Xen-changelog] [xen stable-4.10] x86/boot: Allocate one extra module slot for Xen image placement

[p***@xen.org]

commit 61dc0159b69bd3eec109188386c8b13fbdfed7b2
Author: Daniel Kiper <***@oracle.com>
AuthorDate: Mon Oct 8 14:40:21 2018 +0200
Commit: Jan Beulich <***@suse.com>
CommitDate: Mon Oct 8 14:40:21 2018 +0200

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 <***@citrix.com>
Signed-off-by: Daniel Kiper <***@oracle.com>
Acked-by: Andrew Cooper <***@citrix.com>
master commit: 4c5f9dbebc0bd2afee1ecd936c74ffe65756950f
master date: 2018-09-27 11:17:47 +0100
---
xen/arch/x86/boot/reloc.c | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)

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);
}

--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.10