File 5bacae4b-x86-boot-allocate-extra-module-slot.patch of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File 5bacae4b-x86-boot-allocate-extra-module-slot.patch of Package xen (Revision 021cf114e57eb13300c8ea32f91089cd)

Currently displaying revision 021cf114e57eb13300c8ea32f91089cd , Show latest

# Commit 4c5f9dbebc0bd2afee1ecd936c74ffe65756950f
# Date 2018-09-27 11:17:47 +0100
# Author Daniel Kiper <daniel.kiper@oracle.com>
# Committer Andrew Cooper <andrew.cooper3@citrix.com>
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 <wei.liu2@citrix.com>
Signed-off-by: Daniel Kiper <daniel.kiper@oracle.com>
Acked-by: Andrew Cooper <andrew.cooper3@citrix.com>

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

Places

File 5bacae4b-x86-boot-allocate-extra-module-slot.patch of Package xen (Revision 021cf114e57eb13300c8ea32f91089cd)

Places