diff options
| author | Jan Beulich <jbeulich@suse.com> | 2013-10-22 12:07:40 +0200 |
|---|---|---|
| committer | Jan Beulich <jbeulich@suse.com> | 2013-10-22 12:07:40 +0200 |
| commit | a489633284ce1e7d6e48011f198e71351213ecb2 (patch) | |
| tree | 6e817c0e727981b46c2a54c6d7db6b5d5b5dbd56 | |
| parent | f17eab34ef3d53920816771f4ab5f907160e6ca6 (diff) | |
| download | xen-staging-4.2.tar.gz xen-staging-4.2.tar.bz2 xen-staging-4.2.zip | |
x86-64: check for canonical address before doing page walksstaging-4.2
... as there doesn't really exists any valid mapping for them.
Particularly in the case of do_page_walk() this also avoids returning
non-NULL for such invalid input.
Suggested-by: Andrew Cooper <andrew.cooper3@citrix.com>
Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Keir Fraser <keir@xen.org>
master commit: 6fd9b0361e2eb5a7f12bdd5cbf7e42c0d1937d26
master date: 2013-10-11 09:31:16 +0200
| -rw-r--r-- | xen/arch/x86/x86_64/mm.c | 2 | ||||
| -rw-r--r-- | xen/arch/x86/x86_64/traps.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index 635a499d65..02cb7a90e8 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -145,7 +145,7 @@ void *do_page_walk(struct vcpu *v, unsigned long addr) l2_pgentry_t l2e, *l2t; l1_pgentry_t l1e, *l1t; - if ( is_hvm_vcpu(v) ) + if ( is_hvm_vcpu(v) || !is_canonical_address(addr) ) return NULL; l4t = mfn_to_virt(mfn); diff --git a/xen/arch/x86/x86_64/traps.c b/xen/arch/x86/x86_64/traps.c index 00bee9b2cb..d20e5281c7 100644 --- a/xen/arch/x86/x86_64/traps.c +++ b/xen/arch/x86/x86_64/traps.c @@ -169,6 +169,8 @@ void show_page_walk(unsigned long addr) l1_pgentry_t l1e, *l1t; printk("Pagetable walk from %016lx:\n", addr); + if ( !is_canonical_address(addr) ) + return; l4t = mfn_to_virt(mfn); l4e = l4t[l4_table_offset(addr)]; |