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

[Xen patchbot-4.0-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Ian Jackson <Ian.Jackson@xxxxxxxxxxxxx>
# Date 1346844545 -3600
# Node ID 96b08706a0ed4243289d998bfd11f5175f8bde1e
# Parent  92334c7f577e04ab121ee4ce1252ed7edb2a6892
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 92334c7f577e -r 96b08706a0ed xen/arch/x86/mm/p2m.c
--- a/xen/arch/x86/mm/p2m.c     Wed Sep 05 12:27:58 2012 +0100
+++ b/xen/arch/x86/mm/p2m.c     Wed Sep 05 12:29:05 2012 +0100
@@ -2058,7 +2058,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 )

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