[Xen-changelog] [xen stable-4.3] VMX: fix failure path in construct_vmcs

[patchbot@xxxxxxx]

commit 420bd9be17b480d8c2e1c9897bfd3a42d209c8e5
Author:     George Dunlap <george.dunlap@xxxxxxxxxxxxx>
AuthorDate: Mon Sep 23 16:27:39 2013 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Sep 23 16:27:39 2013 +0200

    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@xxxxxxxxxxxxx>
    Signed-off-by: Mukesh Rathor <mukesh.rathor@xxxxxxxxxx>
    master commit: dad7e45bf44c0569546a3ed7d0fa4182a4a73f0a
    master date: 2013-09-18 14:45:42 +0200
---
 xen/arch/x86/hvm/vmx/vmcs.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c
index 759718f..6ef9739 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;
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.3

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog