mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 17:30:02 +00:00
KVM: VMX: Fix interrupt exit condition during emulation
Checking EFLAGS.IF is incorrect as we might be in interrupt shadow. If that is the case, the main loop will notice that and not inject the interrupt, causing an endless loop. Fix by using vmx_interrupt_allowed() to check if we can inject an interrupt instead. Signed-off-by: Avi Kivity <avi@redhat.com>
This commit is contained in:
parent
96051572c8
commit
bdea48e305
1 changed files with 1 additions and 2 deletions
|
@ -4983,8 +4983,7 @@ static int handle_invalid_guest_state(struct kvm_vcpu *vcpu)
|
|||
intr_window_requested = cpu_exec_ctrl & CPU_BASED_VIRTUAL_INTR_PENDING;
|
||||
|
||||
while (!guest_state_valid(vcpu) && count-- != 0) {
|
||||
if (intr_window_requested
|
||||
&& (kvm_get_rflags(&vmx->vcpu) & X86_EFLAGS_IF))
|
||||
if (intr_window_requested && vmx_interrupt_allowed(vcpu))
|
||||
return handle_interrupt_window(&vmx->vcpu);
|
||||
|
||||
err = emulate_instruction(vcpu, 0);
|
||||
|
|
Loading…
Reference in a new issue