x86/HVM: fix failure path in hvm_vcpu_initialise

It looks like one of the failure cases in hvm_vcpu_initialise jumps to
the wrong label; this could lead to slow leaks if something isn't
cleaned up properly.

I will probably change these labels in a future patch, but I figured
it was better to have this fix separately.

This is also a candidate for backport.

Signed-off-by: George Dunlap <george.dunlap@eu.citrix.com>
Signed-off-by: Mukesh Rathor <mukesh.rathor@oracle.com>
master commit: 925fbcb7fdd6238f26b1576dc1f3e297f1f24f1e
master date: 2013-09-18 14:45:24 +0200

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 26a3e9f848d58935a5ba17ffa43b2bc5402ca431..a2fb715116b6910f1620b47039ee85f371d42616 100644 (file)
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -1125,7 +1125,7 @@ int hvm_vcpu_initialise(struct vcpu *v)
         /* Create bufioreq event channel. */
         rc = alloc_unbound_xen_event_channel(v, dm_domid, NULL);
         if ( rc < 0 )
-            goto fail2;
+            goto fail4;
         d->arch.hvm_domain.params[HVM_PARAM_BUFIOREQ_EVTCHN] = rc;
     }