| From 6d1b867d045699d6ce0dfa0ef35d1b87dd36db56 Mon Sep 17 00:00:00 2001 |
| From: Sean Christopherson <seanjc@google.com> |
| Date: Thu, 4 Mar 2021 17:10:56 -0800 |
| Subject: KVM: SVM: Don't strip the C-bit from CR2 on #PF interception |
| |
| From: Sean Christopherson <seanjc@google.com> |
| |
| commit 6d1b867d045699d6ce0dfa0ef35d1b87dd36db56 upstream. |
| |
| Don't strip the C-bit from the faulting address on an intercepted #PF, |
| the address is a virtual address, not a physical address. |
| |
| Fixes: 0ede79e13224 ("KVM: SVM: Clear C-bit from the page fault address") |
| Cc: stable@vger.kernel.org |
| Cc: Brijesh Singh <brijesh.singh@amd.com> |
| Cc: Tom Lendacky <thomas.lendacky@amd.com> |
| Signed-off-by: Sean Christopherson <seanjc@google.com> |
| Message-Id: <20210305011101.3597423-13-seanjc@google.com> |
| Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/x86/kvm/svm/svm.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/arch/x86/kvm/svm/svm.c |
| +++ b/arch/x86/kvm/svm/svm.c |
| @@ -1888,7 +1888,7 @@ static void svm_set_dr7(struct kvm_vcpu |
| |
| static int pf_interception(struct vcpu_svm *svm) |
| { |
| - u64 fault_address = __sme_clr(svm->vmcb->control.exit_info_2); |
| + u64 fault_address = svm->vmcb->control.exit_info_2; |
| u64 error_code = svm->vmcb->control.exit_info_1; |
| |
| return kvm_handle_page_fault(&svm->vcpu, error_code, fault_address, |
