Skip to contentSkip to conversation

x86/xen: Do not clip xen_e820_map to xen_e820_map_entries when sanitizing map

PATCH Applied Malcolm Crossley 3 participants 3 messages Sep 28, 2015

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 x86/xen: Do not clip xen_e820_map to xen_e820_map_entries when sanitizing map

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.

---
 arch/x86/xen/setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/xen/setup.c +1 -1
index f5ef674..415a55f 100644
@@ -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();
Signature · 1 line
1.7.12.4
reviewer Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Malcolm Crossley

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.

Quoted 17 lines
---
  arch/x86/xen/setup.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/xen/setup.c +1 -1
index f5ef674..415a55f 100644
@@ -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();
Applied
#2 lore raw
In reply to Malcolm Crossley
Quoted 7 lines · Malcolm Crossley

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.

Applied to for-linus-4.3b and tagged for stable, thanks.

David

Quoted 20 lines
---
 arch/x86/xen/setup.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/x86/xen/setup.c +1 -1
index f5ef674..415a55f 100644
@@ -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();