[xen stable-4.16] VMX: correct error handling in vmx_create_vmcs()

[patchbot@xxxxxxx]

commit 02ab5e97c41d275ccea0910b1d8bce41ed1be5bf
Author:     Jan Beulich <jbeulich@xxxxxxxx>
AuthorDate: Mon Oct 31 13:20:40 2022 +0100
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Mon Oct 31 13:20:40 2022 +0100

    VMX: correct error handling in vmx_create_vmcs()
    
    With the addition of vmx_add_msr() calls to construct_vmcs() there are
    now cases where simply freeing the VMCS isn't enough: The MSR bitmap
    page as well as one of the MSR area ones (if it's the 2nd vmx_add_msr()
    which fails) may also need freeing. Switch to using vmx_destroy_vmcs()
    instead.
    
    Fixes: 3bd36952dab6 ("x86/spec-ctrl: Introduce an option to control 
L1D_FLUSH for HVM HAP guests")
    Fixes: 53a570b28569 ("x86/spec-ctrl: Support IBPB-on-entry")
    Reported-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
    Reviewed-by: Kevin Tian <kevin.tian@xxxxxxxxx>
    master commit: 448d28309f1a966bdc850aff1a637e0b79a03e43
    master date: 2022-10-12 17:57:56 +0200
---
 xen/arch/x86/hvm/vmx/vmcs.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xen/arch/x86/hvm/vmx/vmcs.c b/xen/arch/x86/hvm/vmx/vmcs.c
index dd817cee4e..237b13459d 100644
--- a/xen/arch/x86/hvm/vmx/vmcs.c
+++ b/xen/arch/x86/hvm/vmx/vmcs.c
@@ -1831,7 +1831,7 @@ int vmx_create_vmcs(struct vcpu *v)
 
     if ( (rc = construct_vmcs(v)) != 0 )
     {
-        vmx_free_vmcs(vmx->vmcs_pa);
+        vmx_destroy_vmcs(v);
         return rc;
     }
 
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.16