x86/kvm/nVMX: don't skip emulated instruction twice when vmptr address is not backed
PATCH 1/1 x86/kvm/nVMX: don't skip emulated instruction twice when vmptr address is not backed
Since commit 09abb5e3e5e50 ("KVM: nVMX: call kvm_skip_emulated_instruction in nested_vmx_{fail,succeed}") nested_vmx_failValid() results in kvm_skip_emulated_instruction() so doing it again in handle_vmptrld() when vmptr address is not backed is wrong, we end up advancing RIP twice.
--- arch/x86/kvm/vmx/nested.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
arch/x86/kvm/vmx/nested.c +1 -2
@@ -4540,9 +4540,8 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu)* given physical address won't match the required * VMCS12_REVISION identifier. */ -nested_vmx_failValid (vcpu, +return nested_vmx_failValid (vcpu,VMXERR_VMPTRLD_INCORRECT_VMCS_REVISION_ID ); -return kvm_skip_emulated_instruction (vcpu); } new_vmcs12 =kmap (page); if (new_vmcs12->hdr.revision_id != VMCS12_REVISION ||
Signature · 1 line
2.20.1
Quoted 8 lines · Vitaly Kuznetsov
Since commit
09abb5e3e5e50("KVM: nVMX: callkvm_skip_emulated_instructionin nested_vmx_{fail,succeed}")nested_vmx_failValid()results inkvm_skip_emulated_instruction()so doing it again inhandle_vmptrld()when vmptr address is not backed is wrong, we end up advancing RIP twice.Fixes fca91f6d60b6e ("kvm: nVMX: Set VM instruction error for VMPTRLD of unbacked page")Reported-by Cornelia Huck <[email protected]>Signed-off-by Vitaly Kuznetsov <[email protected]>
Quoted 22 lines
--- arch/x86/kvm/vmx/nested.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)arch/x86/kvm/vmx/nested.c +1
-2@@ -4540,9 +4540,8 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu)* given physical address won't match the required * VMCS12_REVISION identifier. */ -nested_vmx_failValid (vcpu, +return nested_vmx_failValid (vcpu,VMXERR_VMPTRLD_INCORRECT_VMCS_REVISION_ID ); -return kvm_skip_emulated_instruction (vcpu); } new_vmcs12 =kmap (page); if (new_vmcs12->hdr.revision_id != VMCS12_REVISION ||Signature · 1 line
2.20.1
Quoted 17 lines · On Wed, 9 Jan 2019 18:22:56 +0100 Vitaly Kuznetsov <[email protected]> wrote:
Since commit
09abb5e3e5e50("KVM: nVMX: callkvm_skip_emulated_instructionin nested_vmx_{fail,succeed}")nested_vmx_failValid()results inkvm_skip_emulated_instruction()so doing it again inhandle_vmptrld()when vmptr address is not backed is wrong, we end up advancing RIP twice.Fixes fca91f6d60b6e ("kvm: nVMX: Set VM instruction error for VMPTRLD of unbacked page")Reported-by Cornelia Huck <[email protected]>Signed-off-by Vitaly Kuznetsov <[email protected]>--- arch/x86/kvm/vmx/nested.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)arch/x86/kvm/vmx/nested.c +0
-0
arch/x86/kvm/vmx/nested.c static int handle_vmptrld(struct kvm_vcpu *vcpu) · line 4547
Quoted 10 lines
arch/x86/kvm/vmx/nested.c +1
-2@@ -4540,9 +4540,8 @@ static int handle_vmptrld(struct kvm_vcpu *vcpu)* given physical address won't match the required * VMCS12_REVISION identifier. */ -nested_vmx_failValid (vcpu, +return nested_vmx_failValid (vcpu,VMXERR_VMPTRLD_INCORRECT_VMCS_REVISION_ID ); -return kvm_skip_emulated_instruction (vcpu); } new_vmcs12 =kmap (page); if (new_vmcs12->hdr.revision_id != VMCS12_REVISION ||
Not that I would be a nested vmx expert, but this looks correct.