Commit caea6cf5 authored by Ingo Molnar's avatar Ingo Molnar

Merge branch 'uprobes/core' of...

Merge branch 'uprobes/core' of git://git.kernel.org/pub/scm/linux/kernel/git/oleg/misc into perf/core

Pull uprobes fixes from Oleg Nesterov.
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 4d9218da 2ded0980
...@@ -504,9 +504,8 @@ static bool consumer_del(struct uprobe *uprobe, struct uprobe_consumer *uc) ...@@ -504,9 +504,8 @@ static bool consumer_del(struct uprobe *uprobe, struct uprobe_consumer *uc)
return ret; return ret;
} }
static int static int __copy_insn(struct address_space *mapping, struct file *filp,
__copy_insn(struct address_space *mapping, struct file *filp, char *insn, void *insn, int nbytes, loff_t offset)
unsigned long nbytes, loff_t offset)
{ {
struct page *page; struct page *page;
...@@ -528,28 +527,28 @@ __copy_insn(struct address_space *mapping, struct file *filp, char *insn, ...@@ -528,28 +527,28 @@ __copy_insn(struct address_space *mapping, struct file *filp, char *insn,
static int copy_insn(struct uprobe *uprobe, struct file *filp) static int copy_insn(struct uprobe *uprobe, struct file *filp)
{ {
struct address_space *mapping; struct address_space *mapping = uprobe->inode->i_mapping;
unsigned long nbytes; loff_t offs = uprobe->offset;
int bytes; void *insn = uprobe->arch.insn;
int size = MAX_UINSN_BYTES;
nbytes = PAGE_SIZE - (uprobe->offset & ~PAGE_MASK); int len, err = -EIO;
mapping = uprobe->inode->i_mapping;
/* Instruction at end of binary; copy only available bytes */ /* Copy only available bytes, -EIO if nothing was read */
if (uprobe->offset + MAX_UINSN_BYTES > uprobe->inode->i_size) do {
bytes = uprobe->inode->i_size - uprobe->offset; if (offs >= i_size_read(uprobe->inode))
else break;
bytes = MAX_UINSN_BYTES;
/* Instruction at the page-boundary; copy bytes in second page */ len = min_t(int, size, PAGE_SIZE - (offs & ~PAGE_MASK));
if (nbytes < bytes) { err = __copy_insn(mapping, filp, insn, len, offs);
int err = __copy_insn(mapping, filp, uprobe->arch.insn + nbytes,
bytes - nbytes, uprobe->offset + nbytes);
if (err) if (err)
break;
insn += len;
offs += len;
size -= len;
} while (size);
return err; return err;
bytes = nbytes;
}
return __copy_insn(mapping, filp, uprobe->arch.insn, bytes, uprobe->offset);
} }
static int prepare_uprobe(struct uprobe *uprobe, struct file *file, static int prepare_uprobe(struct uprobe *uprobe, struct file *file,
...@@ -1447,7 +1446,7 @@ void uprobe_copy_process(struct task_struct *t, unsigned long flags) ...@@ -1447,7 +1446,7 @@ void uprobe_copy_process(struct task_struct *t, unsigned long flags)
if (!work) if (!work)
return uprobe_warn(t, "dup xol area"); return uprobe_warn(t, "dup xol area");
utask->vaddr = area->vaddr; t->utask->vaddr = area->vaddr;
init_task_work(work, dup_xol_work); init_task_work(work, dup_xol_work);
task_work_add(t, work, true); task_work_add(t, work, true);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment