aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Daley <mattjd@gmail.com>2013-03-12 16:18:45 +0100
committerJan Beulich <jbeulich@suse.com>2013-03-12 16:18:45 +0100
commit56c501682d9664106bd933d2082d15f80d4eecbc (patch)
tree1244683a13e73a388e8e0e32c0830ca586621871
parent16c5ea879748ea07d62aa9592d8f25f5850ea8f4 (diff)
downloadxen-56c501682d9664106bd933d2082d15f80d4eecbc.tar.gz
xen-56c501682d9664106bd933d2082d15f80d4eecbc.tar.bz2
xen-56c501682d9664106bd933d2082d15f80d4eecbc.zip
fix domain unlocking in some xsm error paths
A couple of xsm error/access-denied code paths in hypercalls neglect to unlock a previously locked domain. Fix by ensuring the domains are unlocked correctly. Signed-off-by: Matthew Daley <mattjd@gmail.com> Reviewed-by: Jan Beulich <jbeulich@suse.com> Acked-by: Keir Fraser <keir@xen.org> master changeset: 9581c4f9a55372a21e759cd449cb676d0e8feddb master date: 2013-03-06 17:10:26 +0100
-rw-r--r--xen/common/grant_table.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/xen/common/grant_table.c b/xen/common/grant_table.c
index 6fb2be9080..0e349cc4d8 100644
--- a/xen/common/grant_table.c
+++ b/xen/common/grant_table.c
@@ -2262,7 +2262,7 @@ gnttab_get_status_frames(XEN_GUEST_HANDLE(gnttab_get_status_frames_t) uop,
rc = xsm_grant_setup(current->domain, d);
if ( rc ) {
op.status = GNTST_permission_denied;
- goto out1;
+ goto out2;
}
gt = d->grant_table;