diff options
| author | Xiao Guangrong <guangrong.xiao@linux.intel.com> | 2015-05-07 16:20:15 +0800 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2015-05-08 10:51:47 +0200 |
| commit | ceee7df749da03fa17ab5dc7d06dffb4980a32db (patch) | |
| tree | 1a909678834a1a1757f47658b2eaaffd4adb329a /arch/x86/kvm/paging_tmpl.h | |
| parent | a4cca3b419a5081788bb7559023159e3147f66f0 (diff) | |
| download | lwn-ceee7df749da03fa17ab5dc7d06dffb4980a32db.tar.gz lwn-ceee7df749da03fa17ab5dc7d06dffb4980a32db.zip | |
KVM: MMU: fix smap permission check
Current permission check assumes that RSVD bit in PFEC is always zero,
however, it is not true since MMIO #PF will use it to quickly identify
MMIO access
Fix it by clearing the bit if walking guest page table is needed
Signed-off-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'arch/x86/kvm/paging_tmpl.h')
| -rw-r--r-- | arch/x86/kvm/paging_tmpl.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/x86/kvm/paging_tmpl.h b/arch/x86/kvm/paging_tmpl.h index fd49c867b25a..6e6d115fe9b5 100644 --- a/arch/x86/kvm/paging_tmpl.h +++ b/arch/x86/kvm/paging_tmpl.h @@ -718,6 +718,13 @@ static int FNAME(page_fault)(struct kvm_vcpu *vcpu, gva_t addr, u32 error_code, mmu_is_nested(vcpu)); if (likely(r != RET_MMIO_PF_INVALID)) return r; + + /* + * page fault with PFEC.RSVD = 1 is caused by shadow + * page fault, should not be used to walk guest page + * table. + */ + error_code &= ~PFERR_RSVD_MASK; }; r = mmu_topup_memory_caches(vcpu); |