aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/kvm
diff options
context:
space:
mode:
authorAvi Kivity <avi@qumranet.com>2007-12-09 09:37:36 -0500
committerAvi Kivity <avi@qumranet.com>2008-01-30 10:53:20 -0500
commit8d87a03aea43535a92efbb180e0ceac94d4bb5db (patch)
tree109fc349fbf4010155eab1393fa71c3a7029a110 /drivers/kvm
parentfe135d2ceb3d7dc08151b3cbad96565d02cc8676 (diff)
KVM: MMU: Set nx bit correctly on shadow ptes
While the page table walker correctly generates a guest page fault if a guest tries to execute a non-executable page, the shadow code does not mark it non-executable. This means that if a guest accesses an nx page first with a read access, then subsequent code fetch accesses will succeed. Fix by setting the nx bit on shadow ptes. Signed-off-by: Avi Kivity <avi@qumranet.com>
Diffstat (limited to 'drivers/kvm')
-rw-r--r--drivers/kvm/paging_tmpl.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/kvm/paging_tmpl.h b/drivers/kvm/paging_tmpl.h
index 7688cbf413c8..59ba752a6880 100644
--- a/drivers/kvm/paging_tmpl.h
+++ b/drivers/kvm/paging_tmpl.h
@@ -255,6 +255,8 @@ static void FNAME(set_pte)(struct kvm_vcpu *vcpu, pt_element_t gpte,
255 spte |= gpte & PT64_NX_MASK; 255 spte |= gpte & PT64_NX_MASK;
256 if (!dirty) 256 if (!dirty)
257 pte_access &= ~ACC_WRITE_MASK; 257 pte_access &= ~ACC_WRITE_MASK;
258 if (!(pte_access & ACC_EXEC_MASK))
259 spte |= PT64_NX_MASK;
258 260
259 page = gfn_to_page(vcpu->kvm, gfn); 261 page = gfn_to_page(vcpu->kvm, gfn);
260 262