From: Oleg Nesterov <oleg@redhat.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Anton Arapov <anton@redhat.com>,
Peter Zijlstra <peterz@infradead.org>,
Srikar Dronamraju <srikar@linux.vnet.ibm.com>,
linux-kernel@vger.kernel.org
Subject: [PATCH 7/9] uprobes: fix overflow in vma_address/find_active_uprobe
Date: Fri, 13 Jul 2012 18:46:37 +0200 [thread overview]
Message-ID: <20120713164637.GA23565@redhat.com> (raw)
In-Reply-To: <20120713164552.GA23509@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>
Acked-by: Srikar Dronamraju <srikar.vnet.ibm.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..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
next prev parent reply other threads:[~2012-07-13 16:49 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-13 16:45 [PATCH 0/9] uprobes: misc, resend Oleg Nesterov
2012-07-13 16:46 ` [PATCH 1/9] uprobes: don't recheck vma/f_mapping in write_opcode() Oleg Nesterov
2012-07-13 16:46 ` [PATCH 2/9] uprobes: __replace_page() should not use page_address_in_vma() Oleg Nesterov
2012-07-13 16:46 ` [PATCH 3/9] uprobes: kill write_opcode()->lock_page(new_page) Oleg Nesterov
2012-07-13 16:46 ` [PATCH 4/9] uprobes: cleanup and document write_opcode()->lock_page(old_page) Oleg Nesterov
2012-07-13 16:46 ` [PATCH 5/9] uprobes: uprobe_mmap/munmap needs list_for_each_entry_safe() Oleg Nesterov
2012-07-13 16:46 ` [PATCH 6/9] uprobes: suppress uprobe_munmap() from mmput() Oleg Nesterov
2012-07-13 16:46 ` Oleg Nesterov [this message]
2012-07-13 16:46 ` [PATCH 8/9] uprobes: kill copy_vma()->uprobe_mmap() Oleg Nesterov
2012-07-13 16:46 ` [PATCH 9/9] uprobes: kill insert_vm_struct()->uprobe_mmap() Oleg Nesterov
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=20120713164637.GA23565@redhat.com \
--to=oleg@redhat.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox