[Xen-changelog] [xen-unstable] xen: fix XEN_DOMCTL_memory_mapping to not return with domain RCU lock held

[Xen patchbot-unstable <patchbot@xxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1295341444 0
# Node ID e4688c57c2303432c48db16a5f72247c1c0e914e
# Parent  96441daf4a5b71bb5df81b9475a08f307d1d53e5
xen: fix XEN_DOMCTL_memory_mapping to not return with domain RCU lock held

Broken in 20358:ecc649ec3675

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 xen/arch/x86/domctl.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff -r 96441daf4a5b -r e4688c57c230 xen/arch/x86/domctl.c
--- a/xen/arch/x86/domctl.c     Tue Jan 18 09:01:57 2011 +0000
+++ b/xen/arch/x86/domctl.c     Tue Jan 18 09:04:04 2011 +0000
@@ -965,13 +965,13 @@ long arch_do_domctl(
         if ( (mfn + nr_mfns - 1) < mfn ) /* wrap? */
             break;
 
-        ret = -ESRCH;
-        if ( unlikely((d = rcu_lock_domain_by_id(domctl->domain)) == NULL) )
-            break;
-
         ret = -EPERM;
         if ( !IS_PRIV(current->domain) &&
              !iomem_access_permitted(current->domain, mfn, mfn + nr_mfns - 1) )
+            break;
+
+        ret = -ESRCH;
+        if ( unlikely((d = rcu_lock_domain_by_id(domctl->domain)) == NULL) )
             break;
 
         ret=0;

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