Patch "KVM: MMU: fix CR4.SMEP=1, CR0.WP=0 with shadow pages" has been added to the 4.0-stable tree

This is a note to let you know that I've just added the patch titled

KVM: MMU: fix CR4.SMEP=1, CR0.WP=0 with shadow pages

to the 4.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:

     kvm-mmu-fix-cr4.smep-1-cr0.wp-0-with-shadow-pages.patch

and it can be found in the queue-4.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Paolo Bonzini <[email protected]>
Date: Thu, 2 Apr 2015 11:04:05 +0200
Subject: KVM: MMU: fix CR4.SMEP=1, CR0.WP=0 with shadow pages

From: Paolo Bonzini <[email protected]>

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.

---
 arch/x86/kvm/mmu.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

@@ -4238,7 +4238,7 @@ void kvm_mmu_pte_write(struct kvm_vcpu *
 	++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) {
 		if (detect_write_misaligned(sp, gpa, bytes) ||
 		      detect_write_flooding(sp)) {

Patches currently in stable-queue which might be from [email protected] are

queue-4.0/kvm-fix-crash-in-kvm_vcpu_reload_apic_access_page.patch queue-4.0/kvm-mmu-fix-smap-permission-check.patch queue-4.0/revert-kvm-x86-drop-fpu_activate-hook.patch queue-4.0/kvm-mmu-fix-cr4.smep-1-cr0.wp-0-with-shadow-pages.patch queue-4.0/kvm-mmu-fix-smap-virtualization.patch queue-4.0/kvm-fpu-enable-eager-restore-kvm-fpu-for-mpx.patch