| From 7a256e68fa685bbbc887f3c77d10bd0c2f49004d Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 30 Nov 2021 15:53:37 +0300 |
| Subject: KVM: VMX: Set failure code in prepare_vmcs02() |
| |
| From: Dan Carpenter <dan.carpenter@oracle.com> |
| |
| [ Upstream commit bfbb307c628676929c2d329da0daf9d22afa8ad2 ] |
| |
| The error paths in the prepare_vmcs02() function are supposed to set |
| *entry_failure_code but this path does not. It leads to using an |
| uninitialized variable in the caller. |
| |
| Fixes: 71f7347025bf ("KVM: nVMX: Load GUEST_IA32_PERF_GLOBAL_CTRL MSR on VM-Entry") |
| Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com> |
| Message-Id: <20211130125337.GB24578@kili> |
| Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/x86/kvm/vmx/nested.c | 4 +++- |
| 1 file changed, 3 insertions(+), 1 deletion(-) |
| |
| diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c |
| index 257ec2cbf69a4..36661b15c3d04 100644 |
| --- a/arch/x86/kvm/vmx/nested.c |
| +++ b/arch/x86/kvm/vmx/nested.c |
| @@ -2619,8 +2619,10 @@ static int prepare_vmcs02(struct kvm_vcpu *vcpu, struct vmcs12 *vmcs12, |
| |
| if ((vmcs12->vm_entry_controls & VM_ENTRY_LOAD_IA32_PERF_GLOBAL_CTRL) && |
| WARN_ON_ONCE(kvm_set_msr(vcpu, MSR_CORE_PERF_GLOBAL_CTRL, |
| - vmcs12->guest_ia32_perf_global_ctrl))) |
| + vmcs12->guest_ia32_perf_global_ctrl))) { |
| + *entry_failure_code = ENTRY_FAIL_DEFAULT; |
| return -EINVAL; |
| + } |
| |
| kvm_rsp_write(vcpu, vmcs12->guest_rsp); |
| kvm_rip_write(vcpu, vmcs12->guest_rip); |
| -- |
| 2.33.0 |
| |