From: Mahmoud Abumandour When a nested VM-Exit occurs while L2 is vectoring a software interrupt, save the INTn's length in vmcs12's VM-Exit instruction length, as is done for software exceptions, instead of VM-Entry instruction length. Fixes: 5f3d5799974b ("KVM: nVMX: Rework event injection and recovery") Signed-off-by: Mahmoud Abumandour --- arch/x86/kvm/vmx/nested.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/x86/kvm/vmx/nested.c b/arch/x86/kvm/vmx/nested.c index 6f7c00083beb..4286b0503046 100644 --- a/arch/x86/kvm/vmx/nested.c +++ b/arch/x86/kvm/vmx/nested.c @@ -4016,7 +4016,7 @@ static void vmcs12_save_pending_event(struct kvm_vcpu *vcpu, if (vcpu->arch.interrupt.soft) { idt_vectoring |= INTR_TYPE_SOFT_INTR; - vmcs12->vm_entry_instruction_len = + vmcs12->vm_exit_instruction_len = vcpu->arch.event_exit_inst_len; } else idt_vectoring |= INTR_TYPE_EXT_INTR; -- 2.43.0