From: George Dunlap <george.dunlap@eu.citrix.com>
Date: Wed, 18 Sep 2013 12:45:24 +0000 (+0200)
Subject: x86/HVM: fix failure path in hvm_vcpu_initialise
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~6327
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=925fbcb7fdd6238f26b1576dc1f3e297f1f24f1e;p=xen.git

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>
---

diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c
index 8fd218e2f7..72031846db 100644
--- a/xen/arch/x86/hvm/hvm.c
+++ b/xen/arch/x86/hvm/hvm.c
@@ -1118,7 +1118,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;
     }