[Xen-devel] [PATCH 2/2] xen/setup: warn on bad Xen-supplied memory map

[Martin Kelly <martin@xxxxxxxxxxxxxxxx>]

Currently, we don't check the return code of sanitize_e820_map. However,
if the Xen-supplied memory map is invalid, then sanitize_e820_map will
return without doing anything, potentially leading to errors later on.
Add a WARN_ON in case sanitize_e820_map detects an invalid memory map.

Signed-off-by: Martin Kelly <martkell@xxxxxxxxxx>
---
 arch/x86/xen/setup.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/arch/x86/xen/setup.c b/arch/x86/xen/setup.c
index af72161..48c7072 100644
--- a/arch/x86/xen/setup.c
+++ b/arch/x86/xen/setup.c
@@ -608,7 +608,8 @@ char * __init xen_memory_setup(void)
                xen_ignore_unusable(map, memmap.nr_entries);
 
        /* Make sure the Xen-supplied memory map is well-ordered. */
-       sanitize_e820_map(map, memmap.nr_entries, &memmap.nr_entries);
+       rc = sanitize_e820_map(map, memmap.nr_entries, &memmap.nr_entries);
+       WARN_ON(rc == E820_RC_BAD_MAP);
 
        max_pages = xen_get_max_pages();
        if (max_pages > max_pfn)
-- 
2.1.1


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel