evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

uprobes: Fix overflow in vma_address()/find_active_uprobe()

Browse source 
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 <oleg@redhat.com>
Acked-by: Srikar Dronamraju <srikar.vnet.ibm.com>
Cc: Anton Arapov <anton@redhat.com>
Cc: Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Link: http://lkml.kernel.org/r/20120729182233.GA20339@redhat.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
Oleg Nesterov 2012-07-29 20:22:33 +02:00 • committed by Ingo Molnar
parent 2fd611a991
commit aefd8933d4
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kernel/events/uprobes.c
View file

@ -117,7 +117,7 @@ static loff_t vma_address(struct vm_area_struct *vma, loff_t offset)
loff_t vaddr; loff_t vaddr;
vaddr = vma->vm_start + offset; vaddr = vma->vm_start + offset;
vaddr -= vma->vm_pgoff << PAGE_SHIFT; vaddr -= (loff_t)vma->vm_pgoff << PAGE_SHIFT;
return vaddr; 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; inode = vma->vm_file->f_mapping->host;
offset = bp_vaddr - vma->vm_start; 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); uprobe = find_uprobe(inode, offset);
} }