Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 593609a5 authored by Oleg Nesterov's avatar Oleg Nesterov Committed by Ingo Molnar
Browse files

uprobes: __copy_insn() needs "loff_t offset" 



1. __copy_insn() needs "loff_t offset", not "unsigned long",
   to read the file.

2. use pgoff_t for "idx" and remove the unnecessary typecast.

3. fix the typo, "&=" is not what we want

4. can't resist, rename off1 to off.

Signed-off-by: default avatarOleg Nesterov <oleg@redhat.com>
Acked-by: default avatarSrikar Dronamraju <srikar@linux.vnet.ibm.com>
Acked-by: default avatarAnanth N Mavinakayanahalli <ananth@in.ibm.com>
Cc: Anton Arapov <anton@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/20120615154359.GA9625@redhat.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 816c03fb

kernel/events/uprobes.c

+6 −6
Original line number Diff line number Diff line
@@ -581,12 +581,12 @@ static bool consumer_del(struct uprobe *uprobe, struct uprobe_consumer *uc) 


static int

__copy_insn(struct address_space *mapping, struct file *filp, char *insn,

			unsigned long nbytes, unsigned long offset)

			unsigned long nbytes, loff_t offset)

{

	struct page *page;

	void *vaddr;

	unsigned long off1;

	unsigned long idx;

	unsigned long off;

	pgoff_t idx;



	if (!filp)

		return -EINVAL;
@@ -594,8 +594,8 @@ __copy_insn(struct address_space *mapping, struct file *filp, char *insn, 
	if (!mapping->a_ops->readpage)

		return -EIO;



	idx = (unsigned long)(offset >> PAGE_CACHE_SHIFT);

	off1 = offset &= ~PAGE_MASK;

	idx = offset >> PAGE_CACHE_SHIFT;

	off = offset & ~PAGE_MASK;



	/*

	 * Ensure that the page that has the original instruction is
@@ -606,7 +606,7 @@ __copy_insn(struct address_space *mapping, struct file *filp, char *insn, 
		return PTR_ERR(page);



	vaddr = kmap_atomic(page);

	memcpy(insn, vaddr + off1, nbytes);

	memcpy(insn, vaddr + off, nbytes);

	kunmap_atomic(vaddr);

	page_cache_release(page);