OSDN Git Service

x86/xen: Do not clip xen_e820_map to xen_e820_map_entries when sanitizing map
authorMalcolm Crossley <malcolm.crossley@citrix.com>
Mon, 28 Sep 2015 10:36:52 +0000 (11:36 +0100)
committerDavid Vrabel <david.vrabel@citrix.com>
Mon, 28 Sep 2015 17:03:38 +0000 (18:03 +0100)
Sanitizing the e820 map may produce extra E820 entries which would result in
the topmost E820 entries being removed. The removed entries would typically
include the top E820 usable RAM region and thus result in the domain having
signicantly less RAM available to it.

Fix by allowing sanitize_e820_map to use the full size of the allocated E820
array.

Signed-off-by: Malcolm Crossley <malcolm.crossley@citrix.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: David Vrabel <david.vrabel@citrix.com>
arch/x86/xen/setup.c

index 4ebfcec..1c30e4a 100644 (file)
@@ -798,7 +798,7 @@ char * __init xen_memory_setup(void)
                xen_ignore_unusable();
 
        /* Make sure the Xen-supplied memory map is well-ordered. */
-       sanitize_e820_map(xen_e820_map, xen_e820_map_entries,
+       sanitize_e820_map(xen_e820_map, ARRAY_SIZE(xen_e820_map),
                          &xen_e820_map_entries);
 
        max_pages = xen_get_max_pages();