diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2015-04-02 11:04:05 +0200 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-08-07 00:32:11 +0100 |
| commit | c36b570ffcc2cf8d0de724f24ac9fc99e2f16421 (patch) | |
| tree | 2f44414639580b262454adf43a8ed1ae682f48cb /arch | |
| parent | 06b9576ec258ff39f0f95a226c49a03d7aca68a1 (diff) | |
| download | kernel_samsung_smdk4412-c36b570ffcc2cf8d0de724f24ac9fc99e2f16421.zip kernel_samsung_smdk4412-c36b570ffcc2cf8d0de724f24ac9fc99e2f16421.tar.gz kernel_samsung_smdk4412-c36b570ffcc2cf8d0de724f24ac9fc99e2f16421.tar.bz2 | |
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>
[bwh: Backported to 3.2: adjust context]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'arch')
| -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 bfc9507..4a949c7 100644 --- a/arch/x86/kvm/mmu.c +++ b/arch/x86/kvm/mmu.c @@ -3609,7 +3609,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *vcpu, gpa_t gpa, } } - 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) { pte_size = sp->role.cr4_pae ? 8 : 4; misaligned = (offset ^ (offset + bytes - 1)) & ~(pte_size - 1); |