diff options
| -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)]; |