]> xenbits.xensource.com Git - people/aperard/xen-arm.git/commitdiff
x86: properly fail mmuext ops when get_page_from_gfn() fails
authorJan Beulich <jbeulich@suse.com>
Fri, 7 Dec 2012 12:40:46 +0000 (13:40 +0100)
committerJan Beulich <jbeulich@suse.com>
Fri, 7 Dec 2012 12:40:46 +0000 (13:40 +0100)
I noticed this inconsistency while analyzing the code for XSA-32.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Acked-by: Keir Fraser <keir@xen.org>
xen/arch/x86/mm.c

index ab94b022c64a68edab605ddf2f18ec19fdb66928..e2b74be6d46e94f0a5e766832088f944ed196c94 100644 (file)
@@ -2776,7 +2776,7 @@ long do_mmuext_op(
             page = get_page_from_gfn(pg_owner, op.arg1.mfn, NULL, P2M_ALLOC);
             if ( unlikely(!page) )
             {
-                rc = -EINVAL;
+                okay = 0;
                 break;
             }
 
@@ -2836,6 +2836,7 @@ long do_mmuext_op(
             page = get_page_from_gfn(pg_owner, op.arg1.mfn, NULL, P2M_ALLOC);
             if ( unlikely(!page) )
             {
+                okay = 0;
                 MEM_LOG("Mfn %lx bad domain", op.arg1.mfn);
                 break;
             }