From: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Date: Thu, 2 Feb 2012 15:23:04 +0000 (+0000)
Subject: xen/xsm: fix incorrect handling of XSM hook return
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=cc64b587f5f0545cf9f85c5b748b8bb71bf9fa26;p=xen.git

xen/xsm: fix incorrect handling of XSM hook return

If the XSM hook denied access, the execution incorrectly continued on
after an extra unlock domain.

Reported-by: John McDermott <john.mcdermott@nrl.navy.mil>
Signed-off-by: Daniel De Graaf <dgdegra@tycho.nsa.gov>
Committed-by: Keir Fraser <keir@xen.org>
---

diff --git a/xen/arch/x86/domctl.c b/xen/arch/x86/domctl.c
index 9c9d5d1e24..831cddaa15 100644
--- a/xen/arch/x86/domctl.c
+++ b/xen/arch/x86/domctl.c
@@ -648,7 +648,7 @@ long arch_do_domctl(
 
         ret = xsm_machine_address_size(d, domctl->cmd);
         if ( ret )
-            rcu_unlock_domain(d);
+            goto set_machine_address_size_out;
 
         ret = -EBUSY;
         if ( d->tot_pages > 0 )