aboutsummaryrefslogtreecommitdiffstats
path: root/xen
diff options
context:
space:
mode:
authorDaniel De Graaf <dgdegra@tycho.nsa.gov>2012-02-02 15:23:04 +0000
committerDaniel De Graaf <dgdegra@tycho.nsa.gov>2012-02-02 15:23:04 +0000
commitcc64b587f5f0545cf9f85c5b748b8bb71bf9fa26 (patch)
tree2c8545012fd8410be262f15fe939ae83e7b8b857 /xen
parentc14a9b21171a7dd847188b3f882cf9efd490c414 (diff)
downloadxen-cc64b587f5f0545cf9f85c5b748b8bb71bf9fa26.tar.gz
xen-cc64b587f5f0545cf9f85c5b748b8bb71bf9fa26.tar.bz2
xen-cc64b587f5f0545cf9f85c5b748b8bb71bf9fa26.zip
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>
Diffstat (limited to 'xen')
-rw-r--r--xen/arch/x86/domctl.c2
1 files changed, 1 insertions, 1 deletions
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 )