diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2022-11-30 11:14:35 -0500 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2022-11-30 11:50:39 -0500 |
| commit | df0bb47baa95aad133820b149851d5b94cbc6790 (patch) | |
| tree | 235c922e72ca465a95f9bdfef295872fbe3cdf57 | |
| parent | c1a81f3bd9b40edc1444dfaeac33f92cff0e770a (diff) | |
| download | linux-stable-df0bb47baa95aad133820b149851d5b94cbc6790.tar.gz linux-stable-df0bb47baa95aad133820b149851d5b94cbc6790.tar.bz2 linux-stable-df0bb47baa95aad133820b149851d5b94cbc6790.zip | |
KVM: x86: fix uninitialized variable use on KVM_REQ_TRIPLE_FAULT
If a triple fault was fixed by kvm_x86_ops.nested_ops->triple_fault (by
turning it into a vmexit), there is no need to leave vcpu_enter_guest().
Any vcpu->requests will be caught later before the actual vmentry,
and in fact vcpu_enter_guest() was not initializing the "r" variable.
Depending on the compiler's whims, this could cause the
x86_64/triple_fault_event_test test to fail.
Cc: Maxim Levitsky <mlevitsk@redhat.com>
Fixes: 92e7d5c83aff ("KVM: x86: allow L1 to not intercept triple fault")
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
| -rw-r--r-- | arch/x86/kvm/x86.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 246bdc9a9154..7f850dfb4086 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -10280,8 +10280,8 @@ static int vcpu_enter_guest(struct kvm_vcpu *vcpu) vcpu->run->exit_reason = KVM_EXIT_SHUTDOWN; vcpu->mmio_needed = 0; r = 0; + goto out; } - goto out; } if (kvm_check_request(KVM_REQ_APF_HALT, vcpu)) { /* Page is swapped out. Do synthetic halt */ |