File CVE-2012-3496-xsa14.patch of Package xen.854

xen: Don't BUG_ON() PoD operations on a non-translated guest.

This is XSA-14 / CVE-2012-3496

Signed-off-by: Tim Deegan <tim@xen.org>
Reviewed-by: Ian Campbell <ian.campbell@citrix.com>
Tested-by: Ian Campbell <ian.campbell@citrix.com>

Index: xen-4.0.3-testing/xen/arch/x86/mm/p2m.c
===================================================================
--- xen-4.0.3-testing.orig/xen/arch/x86/mm/p2m.c
+++ xen-4.0.3-testing/xen/arch/x86/mm/p2m.c
@@ -2081,7 +2081,8 @@ guest_physmap_mark_populate_on_demand(st
     int pod_count = 0;
     int rc = 0;
 
-    BUG_ON(!paging_mode_translate(d));
+    if ( !paging_mode_translate(d) )
+        return -EINVAL;
 
     rc = gfn_check_limit(d, gfn, order);
     if ( rc != 0 )