[Xen-changelog] [xen-unstable] xen: Don't BUG_ON() PoD operations on a non-translated guest.

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
# Date 1346844543 -3600
# Node ID bcf58ef63b7c844fe431eb9e394fc1ea5dd437c4
# Parent  4f1c696482016e7ba76f222c5875618c37680286
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@xxxxxxx>
Reviewed-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
Tested-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---


diff -r 4f1c69648201 -r bcf58ef63b7c xen/arch/x86/mm/p2m-pod.c
--- a/xen/arch/x86/mm/p2m-pod.c Wed Sep 05 12:27:25 2012 +0100
+++ b/xen/arch/x86/mm/p2m-pod.c Wed Sep 05 12:29:03 2012 +0100
@@ -1117,7 +1117,8 @@ guest_physmap_mark_populate_on_demand(st
     mfn_t omfn;
     int rc = 0;
 
-    BUG_ON(!paging_mode_translate(d));
+    if ( !paging_mode_translate(d) )
+        return -EINVAL;
 
     rc = p2m_gfn_check_limit(d, gfn, order);
     if ( rc != 0 )

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog