summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Cantrill <bryan@joyent.com>2011-08-06 21:49:37 -0700
committerBryan Cantrill <bryan@joyent.com>2011-08-06 21:49:37 -0700
commitaca837db5c91a16208314a26872fc144cc54d35f (patch)
tree664d4e3b4952e76b698c4b5170165f19b52c6f55
parent0d68f14bbb32fde9f08d1f28e621b4e3f92d9834 (diff)
downloadillumos-kvm-aca837db5c91a16208314a26872fc144cc54d35f.tar.gz
HVM-577 KVM: MMU: fix conflict access permissions in direct sp
-rw-r--r--kvm_paging_tmpl.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/kvm_paging_tmpl.h b/kvm_paging_tmpl.h
index 308a007..c8762c2 100644
--- a/kvm_paging_tmpl.h
+++ b/kvm_paging_tmpl.h
@@ -356,6 +356,8 @@ static uint64_t *FNAME(fetch)(struct kvm_vcpu *vcpu, gva_t addr,
direct = 1;
if (!is_dirty_gpte(gw->ptes[level - delta]))
access &= ~ACC_WRITE_MASK;
+ access &= gw->pte_access;
+
table_gfn = gpte_to_gfn(gw->ptes[level - delta]);
/* advance table_gfn when emulating 1gb pages with 4k */
if (delta == 0)