[Xen-changelog] [xen stable-4.5] efi: fix allocation problems if ExitBootServices() fails

[patchbot@xxxxxxx]

commit b0dca512a13d4038aa2b369012ed7b053991a055
Author:     Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>
AuthorDate: Thu Jun 18 08:48:59 2015 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Jun 18 08:48:59 2015 +0200

    efi: fix allocation problems if ExitBootServices() fails
    
    If calling ExitBootServices() fails, the required memory map size may
    have increased. When initially allocating the memory map, allocate a
    slightly larger buffer (by an arbitrary 8 entries) to fix this.
    
    The ARM code path was already allocating a larger buffer than required,
    so this moves the code to be common for all architectures.
    
    This was seen on the following machine when using the iscsidxe UEFI
    driver. The machine would consistently fail the first call to
    ExitBootServices().
    System Information
            Manufacturer: Supermicro
            Product Name: X10SLE-F/HF
    BIOS Information
            Vendor: American Megatrends Inc.
            Version: 2.00
            Release Date: 04/24/2014
    
    Signed-off-by: Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>
    Acked-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Roy Franz <roy.franz@xxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    
    EFI: map allocation size must be set to zero
    
    Commit 8a753b3f1c ("efi: fix allocation problems if ExitBootServices()
    fails") replaced the use of a static (and hence zero-initialized)
    variable by an automatic (and hence uninitialized) one.
    
    Also drop the variable introduced by that commit in favor of re-using
    another available and suitable one.
    
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Acked-by: Ross Lagerwall <ross.lagerwall@xxxxxxxxxx>
    Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
    master commit: 8a753b3f1cf5e4714974196df9517849bf174324
    master date: 2015-06-02 13:44:24 +0200
    master commit: 4c94684bb7c20ff01d03fb1f22c03cc0c2fc417b
    master date: 2015-06-11 14:47:54 +0200
---
 xen/arch/arm/efi/efi-boot.h |    6 ++----
 xen/arch/x86/efi/efi-boot.h |    4 ++--
 xen/common/efi/boot.c       |    7 +++++--
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/xen/arch/arm/efi/efi-boot.h b/xen/arch/arm/efi/efi-boot.h
index 639942d..0bde0a1 100644
--- a/xen/arch/arm/efi/efi-boot.h
+++ b/xen/arch/arm/efi/efi-boot.h
@@ -370,16 +370,14 @@ static void __init efi_arch_cfg_file_late(EFI_FILE_HANDLE 
dir_handle, char *sect
 {
 }
 
-static void *__init efi_arch_allocate_mmap_buffer(UINTN *map_size)
+static void *__init efi_arch_allocate_mmap_buffer(UINTN map_size)
 {
     void *ptr;
     EFI_STATUS status;
-    UINTN map_size_alloc = *map_size + EFI_PAGE_SIZE;
 
-    status = efi_bs->AllocatePool(EfiLoaderData, map_size_alloc, &ptr);
+    status = efi_bs->AllocatePool(EfiLoaderData, map_size, &ptr);
     if ( status != EFI_SUCCESS )
         return NULL;
-    *map_size = map_size_alloc;
     return ptr;
 }
 
diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h
index 3a3b4fe..cd14c19 100644
--- a/xen/arch/x86/efi/efi-boot.h
+++ b/xen/arch/x86/efi/efi-boot.h
@@ -190,10 +190,10 @@ static void __init 
efi_arch_process_memory_map(EFI_SYSTEM_TABLE *SystemTable,
 
 }
 
-static void *__init efi_arch_allocate_mmap_buffer(UINTN *map_size)
+static void *__init efi_arch_allocate_mmap_buffer(UINTN map_size)
 {
     place_string(&mbi.mem_upper, NULL);
-    mbi.mem_upper -= *map_size;
+    mbi.mem_upper -= map_size;
     mbi.mem_upper &= -__alignof__(EFI_MEMORY_DESCRIPTOR);
     if ( mbi.mem_upper < xen_phys_start )
         return NULL;
diff --git a/xen/common/efi/boot.c b/xen/common/efi/boot.c
index ac6881e..9f3e075 100644
--- a/xen/common/efi/boot.c
+++ b/xen/common/efi/boot.c
@@ -1046,14 +1046,17 @@ efi_start(EFI_HANDLE ImageHandle, EFI_SYSTEM_TABLE 
*SystemTable)
             efi_arch_video_init(gop, info_size, mode_info);
     }
 
-    efi_bs->GetMemoryMap(&efi_memmap_size, NULL, &map_key,
+    info_size = 0;
+    efi_bs->GetMemoryMap(&info_size, NULL, &map_key,
                          &efi_mdesc_size, &mdesc_ver);
-    efi_memmap = efi_arch_allocate_mmap_buffer(&efi_memmap_size);
+    info_size += 8 * efi_mdesc_size;
+    efi_memmap = efi_arch_allocate_mmap_buffer(info_size);
     if ( !efi_memmap )
         blexit(L"Unable to allocate memory for EFI memory map");
 
     for ( retry = 0; ; retry = 1 )
     {
+        efi_memmap_size = info_size;
         status = efi_bs->GetMemoryMap(&efi_memmap_size, efi_memmap, &map_key,
                                       &efi_mdesc_size, &mdesc_ver);
         if ( EFI_ERROR(status) )
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.5

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog