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

VMX: fix failure path in construct_vmcs

If the allocation fails, make sure to call vmx_vmcs_exit().

This is 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/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c
index 58d38b14a3..0be561689f 100644
--- a/xen/arch/x86/hvm/vmx/vmcs.c
+++ b/xen/arch/x86/hvm/vmx/vmcs.c
@@ -894,7 +894,10 @@ static int construct_vmcs(struct vcpu *v)
         unsigned long *msr_bitmap = alloc_xenheap_page();
 
         if ( msr_bitmap == NULL )
+        {
+            vmx_vmcs_exit(v);
             return -ENOMEM;
+        }
 
         memset(msr_bitmap, ~0, PAGE_SIZE);
         v->arch.hvm_vmx.msr_bitmap = msr_bitmap;