mirror of
https://github.com/torvalds/linux.git
synced 2024-09-21 07:23:06 +00:00
Revert "KVM: SVM: avoid infinite loop on NPF from bad address"
Revert a completely broken check on an "invalid" RIP in SVM's workaround for the DecodeAssists SMAP errata. kvm_vcpu_gfn_to_memslot() obviously expects a gfn, i.e. operates in the guest physical address space, whereas RIP is a virtual (not even linear) address. The "fix" worked for the problematic KVM selftest because the test identity mapped RIP. Fully revert the hack instead of trying to translate RIP to a GPA, as the non-SEV case is now handled earlier, and KVM cannot access guest page tables to translate RIP. This reverts commite72436bc3a
. Fixes:e72436bc3a
("KVM: SVM: avoid infinite loop on NPF from bad address") Reported-by: Liam Merwick <liam.merwick@oracle.com> Cc: stable@vger.kernel.org Signed-off-by: Sean Christopherson <seanjc@google.com> Reviewed-by: Liam Merwick <liam.merwick@oracle.com> Message-Id: <20220120010719.711476-3-seanjc@google.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
parent
55467fcd55
commit
31c2558569
|
@ -4312,13 +4312,6 @@ static bool svm_can_emulate_instruction(struct kvm_vcpu *vcpu, void *insn, int i
|
||||||
if (likely(!insn || insn_len))
|
if (likely(!insn || insn_len))
|
||||||
return true;
|
return true;
|
||||||
|
|
||||||
/*
|
|
||||||
* If RIP is invalid, go ahead with emulation which will cause an
|
|
||||||
* internal error exit.
|
|
||||||
*/
|
|
||||||
if (!kvm_vcpu_gfn_to_memslot(vcpu, kvm_rip_read(vcpu) >> PAGE_SHIFT))
|
|
||||||
return true;
|
|
||||||
|
|
||||||
cr4 = kvm_read_cr4(vcpu);
|
cr4 = kvm_read_cr4(vcpu);
|
||||||
smep = cr4 & X86_CR4_SMEP;
|
smep = cr4 & X86_CR4_SMEP;
|
||||||
smap = cr4 & X86_CR4_SMAP;
|
smap = cr4 & X86_CR4_SMAP;
|
||||||
|
|
|
@ -2248,7 +2248,6 @@ struct kvm_memory_slot *kvm_vcpu_gfn_to_memslot(struct kvm_vcpu *vcpu, gfn_t gfn
|
||||||
|
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL_GPL(kvm_vcpu_gfn_to_memslot);
|
|
||||||
|
|
||||||
bool kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn)
|
bool kvm_is_visible_gfn(struct kvm *kvm, gfn_t gfn)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user