diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-04-02 12:04:05 +0300 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2015-09-18 04:20:40 +0300 |
| commit | 6713867cc85dac704ab8a39065e20997f636b7bd (patch) | |
| tree | 3817af4d4d65c07d7a08c98cb7a51940b917acde | |
| parent | 8450ced97215312b4dbe18d0fdcf8426ff8b3b2d (diff) | |
| download | linux-6713867cc85dac704ab8a39065e20997f636b7bd.tar.xz | |
KVM: MMU: fix CR4.SMEP=1, CR0.WP=0 with shadow pages
commit 898761158be7682082955e3efa4ad24725305fc7 upstream.
smep_andnot_wp is initialized in kvm_init_shadow_mmu and shadow pages
should not be reused for different values of it. Thus, it has to be
added to the mask in kvm_mmu_pte_write.
Reviewed-by: Xiao Guangrong <guangrong.xiao@linux.intel.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
[lizf: Backported to 3.4: adjust context]
Signed-off-by: Zefan Li <lizefan@huawei.com>
| -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 84f4bca0ca2c..2da1a8c9173e 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -3658,7 +3658,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa, ++vcpu->kvm->stat.mmu_pte_write; kvm_mmu_audit(vcpu, AUDIT_PRE_PTE_WRITE); - mask.cr0_wp = mask.cr4_pae = mask.nxe = 1; + mask.cr0_wp = mask.cr4_pae = mask.nxe = mask.smep_andnot_wp = 1; for_each_gfn_indirect_valid_sp(vcpu->kvm, sp, gfn, node) { if (detect_write_misaligned(sp, gpa, bytes) || detect_write_flooding(sp)) { |