From: Ian Campbell <ian.campbell@citrix.com>
Date: Wed, 23 Jul 2014 16:45:30 +0000 (+0100)
Subject: xen: arm: don't release modules which aren't in RAM into the heap
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4609
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=597eaa8db932741f4b49336d5638c5a1833d4f2f;p=xen.git

xen: arm: don't release modules which aren't in RAM into the heap

They might be in e.g. flash or something but more likely they could
be in a bank of RAM which we aren't handling or in RAM which the
bootloader hasn't told us about for some reason.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Julien Grall <julien.grall@linaro.org>
Cc: Fu Wei <fu.wei@linaro.org>
Cc: Roy Franz <roy.franz@linaro.org>
---

diff --git a/xen/arch/arm/setup.c b/xen/arch/arm/setup.c
index e53e491f8b..446b4dc007 100644
--- a/xen/arch/arm/setup.c
+++ b/xen/arch/arm/setup.c
@@ -247,8 +247,13 @@ void __init discard_initial_modules(void)
         paddr_t s = mi->module[i].start;
         paddr_t e = s + PAGE_ALIGN(mi->module[i].size);
 
-        if ( mi->module[i].kind != BOOTMOD_XEN )
-            dt_unreserved_regions(s, e, init_domheap_pages, 0);
+        if ( mi->module[i].kind == BOOTMOD_XEN )
+            continue;
+
+        if ( !mfn_valid(paddr_to_pfn(s)) || !mfn_valid(paddr_to_pfn(e)))
+            continue;
+
+        dt_unreserved_regions(s, e, init_domheap_pages, 0);
     }
 
     mi->nr_mods = 0;