diff options
author | Tim Deegan <tim@xen.org> | 2012-03-07 08:32:29 +0000 |
---|---|---|
committer | Tim Deegan <tim@xen.org> | 2012-03-07 08:32:29 +0000 |
commit | b38a22736815362d93a7d55b2a345936e41aa740 (patch) | |
tree | bac2d9b15ec9aba9fb82350669ccf6f189bcb9b8 | |
parent | ffd14d57a42a3f6b0353c84ecf2fb106245e8af9 (diff) | |
download | xen-b38a22736815362d93a7d55b2a345936e41aa740.tar.gz xen-b38a22736815362d93a7d55b2a345936e41aa740.tar.bz2 xen-b38a22736815362d93a7d55b2a345936e41aa740.zip |
x86/mm: Don't check for invalid bits in non-present PTEs.
If _PAGE_PRESENT is clean in a pagetable entry, any pattern of bits
is valid in the rest of the entry. OSes that special-case
PFEC_invalid_bits (since it should never happen) will be confused
by our setting it in this way.
Signed-off-by: Tim Deegan <tim@xen.org>
xen-unstable changeset: 24883:adcd6ab160fa
xen-unstable date: Thu Feb 23 10:29:27 2012 +0000
-rw-r--r-- | xen/arch/x86/mm/guest_walk.c | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/xen/arch/x86/mm/guest_walk.c b/xen/arch/x86/mm/guest_walk.c index 8b2e555e7e..6c11159fab 100644 --- a/xen/arch/x86/mm/guest_walk.c +++ b/xen/arch/x86/mm/guest_walk.c @@ -162,8 +162,11 @@ guest_walk_tables(struct vcpu *v, struct p2m_domain *p2m, l4p = (guest_l4e_t *) top_map; gw->l4e = l4p[guest_l4_table_offset(va)]; gflags = guest_l4e_get_flags(gw->l4e) ^ iflags; + if ( !(gflags & _PAGE_PRESENT) ) { + rc |= _PAGE_PRESENT; + goto out; + } rc |= ((gflags & mflags) ^ mflags); - if ( rc & _PAGE_PRESENT ) goto out; /* Map the l3 table */ l3p = map_domain_gfn(p2m, @@ -176,9 +179,11 @@ guest_walk_tables(struct vcpu *v, struct p2m_domain *p2m, /* Get the l3e and check its flags*/ gw->l3e = l3p[guest_l3_table_offset(va)]; gflags = guest_l3e_get_flags(gw->l3e) ^ iflags; - rc |= ((gflags & mflags) ^ mflags); - if ( rc & _PAGE_PRESENT ) + if ( !(gflags & _PAGE_PRESENT) ) { + rc |= _PAGE_PRESENT; goto out; + } + rc |= ((gflags & mflags) ^ mflags); #else /* PAE only... */ @@ -213,9 +218,11 @@ guest_walk_tables(struct vcpu *v, struct p2m_domain *p2m, #endif /* All levels... */ gflags = guest_l2e_get_flags(gw->l2e) ^ iflags; - rc |= ((gflags & mflags) ^ mflags); - if ( rc & _PAGE_PRESENT ) + if ( !(gflags & _PAGE_PRESENT) ) { + rc |= _PAGE_PRESENT; goto out; + } + rc |= ((gflags & mflags) ^ mflags); pse = (guest_supports_superpages(v) && (guest_l2e_get_flags(gw->l2e) & _PAGE_PSE)); @@ -277,6 +284,10 @@ guest_walk_tables(struct vcpu *v, struct p2m_domain *p2m, goto out; gw->l1e = l1p[guest_l1_table_offset(va)]; gflags = guest_l1e_get_flags(gw->l1e) ^ iflags; + if ( !(gflags & _PAGE_PRESENT) ) { + rc |= _PAGE_PRESENT; + goto out; + } rc |= ((gflags & mflags) ^ mflags); } |