From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753271Ab2GIK52 (ORCPT ); Mon, 9 Jul 2012 06:57:28 -0400 Received: from mx1.redhat.com ([209.132.183.28]:7867 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753082Ab2GIK51 (ORCPT ); Mon, 9 Jul 2012 06:57:27 -0400 Date: Mon, 9 Jul 2012 12:54:45 +0200 From: Oleg Nesterov To: Joe Perches Cc: Ingo Molnar , Srikar Dronamraju , Ananth N Mavinakayanahalli , Anton Arapov , Peter Zijlstra , linux-kernel@vger.kernel.org Subject: Re: [PATCH 3/5] uprobes: fix overflow in vma_address/find_active_uprobe Message-ID: <20120709105445.GA32699@redhat.com> References: <20120708203006.GA18233@redhat.com> <1341782304.13174.21.camel@joe2Laptop> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1341782304.13174.21.camel@joe2Laptop> User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 07/08, Joe Perches wrote: > > On Sun, 2012-07-08 at 22:30 +0200, Oleg Nesterov wrote: > > @@ -1450,7 +1450,7 @@ static struct uprobe *find_active_uprobe(unsigned long bp_vaddr, int *is_swbp) > > > > inode = vma->vm_file->f_mapping->host; > > offset = bp_vaddr - vma->vm_start; > > - offset += (vma->vm_pgoff << PAGE_SHIFT); > > + offset += ((loff_t)vma->vm_pgoff << PAGE_SHIFT); > > It's be nice to take remove the unnecessary parenthesis > and make it consistent with the vaddr use above it too. OK, please find v2 below. ------------------------------------------------------------------------------ Subject: [PATCH] uprobes: fix overflow in vma_address/find_active_uprobe vma->vm_pgoff is "unsigned long", it should be promoted to loff_t before the multiplication to avoid the overflow. Signed-off-by: Oleg Nesterov --- kernel/events/uprobes.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 47c4e24..6194edb 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -117,7 +117,7 @@ static loff_t vma_address(struct vm_area_struct *vma, loff_t offset) loff_t vaddr; vaddr = vma->vm_start + offset; - vaddr -= vma->vm_pgoff << PAGE_SHIFT; + vaddr -= (loff_t)vma->vm_pgoff << PAGE_SHIFT; return vaddr; } @@ -1450,7 +1450,7 @@ static struct uprobe *find_active_uprobe(unsigned long bp_vaddr, int *is_swbp) inode = vma->vm_file->f_mapping->host; offset = bp_vaddr - vma->vm_start; - offset += (vma->vm_pgoff << PAGE_SHIFT); + offset += (loff_t)vma->vm_pgoff << PAGE_SHIFT; uprobe = find_uprobe(inode, offset); } -- 1.5.5.1