diff options
author | David Matlack <dmatlack@google.com> | 2014-08-18 18:46:07 -0400 |
---|---|---|
committer | Paolo Bonzini <pbonzini@redhat.com> | 2014-09-03 04:03:42 -0400 |
commit | 56f17dd3fbc44adcdbc3340fe3988ddb833a47a7 (patch) | |
tree | a9ca2968a28ef693f00cf1fc01d6590986157e0e /arch/x86/kvm/mmu.c | |
parent | ee3d1570b58677885b4552bce8217fda7b226a68 (diff) |
kvm: x86: fix stale mmio cache bug
The following events can lead to an incorrect KVM_EXIT_MMIO bubbling
up to userspace:
(1) Guest accesses gpa X without a memory slot. The gfn is cached in
struct kvm_vcpu_arch (mmio_gfn). On Intel EPT-enabled hosts, KVM sets
the SPTE write-execute-noread so that future accesses cause
EPT_MISCONFIGs.
(2) Host userspace creates a memory slot via KVM_SET_USER_MEMORY_REGION
covering the page just accessed.
(3) Guest attempts to read or write to gpa X again. On Intel, this
generates an EPT_MISCONFIG. The memory slot generation number that
was incremented in (2) would normally take care of this but we fast
path mmio faults through quickly_check_mmio_pf(), which only checks
the per-vcpu mmio cache. Since we hit the cache, KVM passes a
KVM_EXIT_MMIO up to userspace.
This patch fixes the issue by using the memslot generation number
to validate the mmio cache.
Cc: stable@vger.kernel.org
Signed-off-by: David Matlack <dmatlack@google.com>
[xiaoguangrong: adjust the code to make it simpler for stable-tree fix.]
Signed-off-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Reviewed-by: David Matlack <dmatlack@google.com>
Reviewed-by: Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Tested-by: David Matlack <dmatlack@google.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/mmu.c')
-rw-r--r-- | arch/x86/kvm/mmu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kvm/mmu.c b/arch/x86/kvm/mmu.c index 96515957ba82..1cd2a5fbde07 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c | |||
@@ -3162,7 +3162,7 @@ static void mmu_sync_roots(struct kvm_vcpu *vcpu) | |||
3162 | if (!VALID_PAGE(vcpu->arch.mmu.root_hpa)) | 3162 | if (!VALID_PAGE(vcpu->arch.mmu.root_hpa)) |
3163 | return; | 3163 | return; |
3164 | 3164 | ||
3165 | vcpu_clear_mmio_info(vcpu, ~0ul); | 3165 | vcpu_clear_mmio_info(vcpu, MMIO_GVA_ANY); |
3166 | kvm_mmu_audit(vcpu, AUDIT_PRE_SYNC); | 3166 | kvm_mmu_audit(vcpu, AUDIT_PRE_SYNC); |
3167 | if (vcpu->arch.mmu.root_level == PT64_ROOT_LEVEL) { | 3167 | if (vcpu->arch.mmu.root_level == PT64_ROOT_LEVEL) { |
3168 | hpa_t root = vcpu->arch.mmu.root_hpa; | 3168 | hpa_t root = vcpu->arch.mmu.root_hpa; |