Messages in this thread Patch in this message | | | Date | Mon, 18 Jun 2012 01:57:04 -0700 | From | tip-bot for Oleg Nesterov <> | Subject | [tip:perf/core] uprobes: Copy_insn() should not return -ENOMEM if __copy_insn() fails |
| |
Commit-ID: fc36f59565861af2e897225bc3782479a26c5d5a Gitweb: http://git.kernel.org/tip/fc36f59565861af2e897225bc3782479a26c5d5a Author: Oleg Nesterov <oleg@redhat.com> AuthorDate: Fri, 15 Jun 2012 17:43:44 +0200 Committer: Ingo Molnar <mingo@kernel.org> CommitDate: Sat, 16 Jun 2012 09:10:46 +0200
uprobes: Copy_insn() should not return -ENOMEM if __copy_insn() fails
copy_insn() returns -ENOMEM if the first __copy_insn() fails, it should return the correct error code.
Signed-off-by: Oleg Nesterov <oleg@redhat.com> Acked-by: Srikar Dronamraju <srikar@linux.vnet.ibm.com> Acked-by: Ananth N Mavinakayanahalli <ananth@in.ibm.com> Cc: Anton Arapov <anton@redhat.com> Cc: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/20120615154344.GA9601@redhat.com Signed-off-by: Ingo Molnar <mingo@kernel.org> --- kernel/events/uprobes.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/kernel/events/uprobes.c b/kernel/events/uprobes.c index 08ef566..2db1d94 100644 --- a/kernel/events/uprobes.c +++ b/kernel/events/uprobes.c @@ -641,10 +641,10 @@ static int copy_insn(struct uprobe *uprobe, struct file *filp) /* Instruction at the page-boundary; copy bytes in second page */ if (nbytes < bytes) { - if (__copy_insn(mapping, filp, uprobe->arch.insn + nbytes, - bytes - nbytes, uprobe->offset + nbytes)) - return -ENOMEM; - + int err = __copy_insn(mapping, filp, uprobe->arch.insn + nbytes, + bytes - nbytes, uprobe->offset + nbytes); + if (err) + return err; bytes = nbytes; } return __copy_insn(mapping, filp, uprobe->arch.insn, bytes, uprobe->offset);
| |