From: Oleg Nesterov <oleg@redhat.com>
To: Ingo Molnar <mingo@elte.hu>,
Srikar Dronamraju <srikar@linux.vnet.ibm.com>
Cc: Ananth N Mavinakayanahalli <ananth@in.ibm.com>,
Anton Arapov <anton@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
linux-kernel@vger.kernel.org
Subject: [PATCH 3/5] uprobes: fix overflow in vma_address/find_active_uprobe
Date: Sun, 8 Jul 2012 22:30:06 +0200 [thread overview]
Message-ID: <20120708203006.GA18233@redhat.com> (raw)
In-Reply-To: <20120708202917.GA18188@redhat.com>
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>
---
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..3826b3b 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
next prev parent reply other threads:[~2012-07-08 20:33 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-08 20:29 [PATCH 0/5] uprobes: misc fixlets Oleg Nesterov
2012-07-08 20:30 ` [PATCH 1/5] uprobes: uprobe_mmap/munmap needs list_for_each_entry_safe() Oleg Nesterov
2012-07-12 5:59 ` Srikar Dronamraju
2012-07-08 20:30 ` [PATCH 2/5] uprobes: suppress uprobe_munmap() from mmput() Oleg Nesterov
2012-07-09 8:30 ` Peter Zijlstra
2012-07-09 10:09 ` Oleg Nesterov
2012-07-09 10:13 ` Peter Zijlstra
2012-07-09 10:25 ` Srikar Dronamraju
2012-07-12 5:57 ` Srikar Dronamraju
2012-07-08 20:30 ` Oleg Nesterov [this message]
2012-07-08 21:18 ` [PATCH 3/5] uprobes: fix overflow in vma_address/find_active_uprobe Joe Perches
2012-07-09 10:54 ` Oleg Nesterov
2012-07-12 5:56 ` Srikar Dronamraju
2012-07-08 20:30 ` [PATCH 4/5] uprobes: kill copy_vma()->uprobe_mmap() Oleg Nesterov
2012-07-09 8:35 ` Peter Zijlstra
2012-07-09 10:39 ` Oleg Nesterov
2012-07-13 8:13 ` Srikar Dronamraju
2012-07-08 20:30 ` [PATCH 5/5] uprobes: kill insert_vm_struct()->uprobe_mmap() Oleg Nesterov
2012-07-13 8:11 ` Srikar Dronamraju
2012-07-13 13:29 ` Oleg Nesterov
2012-07-13 14:02 ` Srikar Dronamraju
2012-07-13 14:02 ` Srikar Dronamraju
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20120708203006.GA18233@redhat.com \
--to=oleg@redhat.com \
--cc=ananth@in.ibm.com \
--cc=anton@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=peterz@infradead.org \
--cc=srikar@linux.vnet.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.