From mboxrd@z Thu Jan 1 00:00:00 1970 From: Andrew Cooper Subject: Re: [PATCH 4/4] x86: check for canonical address before doing page walks Date: Thu, 10 Oct 2013 15:01:54 +0100 Message-ID: <5256B352.1050307@citrix.com> References: <5256CC6F02000078000FA3D0@nat28.tlf.novell.com> <5256CDEE02000078000FA3EE@nat28.tlf.novell.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VUGoS-0004Ij-3E for xen-devel@lists.xenproject.org; Thu, 10 Oct 2013 14:02:00 +0000 In-Reply-To: <5256CDEE02000078000FA3EE@nat28.tlf.novell.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Jan Beulich Cc: xen-devel , Keir Fraser List-Id: xen-devel@lists.xenproject.org On 10/10/13 14:55, Jan Beulich wrote: > ... 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 > Signed-off-by: Jan Beulich > > --- a/xen/arch/x86/x86_64/mm.c > +++ b/xen/arch/x86/x86_64/mm.c > @@ -73,7 +73,7 @@ void *do_page_walk(struct vcpu *v, unsig > 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 = map_domain_page(mfn); > --- a/xen/arch/x86/x86_64/traps.c > +++ b/xen/arch/x86/x86_64/traps.c > @@ -170,6 +170,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 = map_domain_page(mfn); > l4e = l4t[l4_table_offset(addr)]; > I was intending something a little more like if ( !is_canonical_address(addr) ) { printk(" Not canonical\n"); return; } So it doesn't appear on the console that show_page_walk() got stuck somewhere. ~Andrew