KVM: SVM: Don't strip the C-bit from CR2 on #PF interception

sean-jc · bonzini · commit 6d1b867d0456 · 2021-03-15T04:42:26.000-04:00
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: 0ede79e ("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>
diff --git a/arch/x86/kvm/svm/svm.c b/arch/x86/kvm/svm/svm.c
@@ -1898,7 +1898,7 @@ static void svm_set_dr7(struct kvm_vcpu *vcpu, unsigned long value)
 
 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,

Original file line number	Diff line number	Diff line change
`@@ -1898,7 +1898,7 @@ static void svm_set_dr7(struct kvm_vcpu *vcpu, unsigned long value)`
`1898`	`1898`
`1899`	`1899`	`static int pf_interception(struct vcpu_svm *svm)`
`1900`	`1900`	`{`
`1901`		`- u64 fault_address = __sme_clr(svm->vmcb->control.exit_info_2);`
	`1901`	`+ u64 fault_address = svm->vmcb->control.exit_info_2;`
`1902`	`1902`	`u64 error_code = svm->vmcb->control.exit_info_1;`
`1903`	`1903`
`1904`	`1904`	`return kvm_handle_page_fault(&svm->vcpu, error_code, fault_address,`