From 1023a7c414b7ca30bb1d7c7329cf670e55502d45 Mon Sep 17 00:00:00 2001 From: Oleg Nesterov Date: Fri, 15 Jun 2012 17:43:44 +0200 Subject: [PATCH] --- yaml --- r: 312235 b: refs/heads/master c: fc36f59565861af2e897225bc3782479a26c5d5a h: refs/heads/master i: 312233: 03ed61fa3e57d86598e42bf4779776e4368f503a 312231: 4d44df91576e8e9696c4a4e72a4cc4fe100f4edd v: v3 --- [refs] | 2 +- trunk/kernel/events/uprobes.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 594d9adc966f..8f4f27425fa5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d436615e60c386095dac4a9bf72b08868d2a7564 +refs/heads/master: fc36f59565861af2e897225bc3782479a26c5d5a diff --git a/trunk/kernel/events/uprobes.c b/trunk/kernel/events/uprobes.c index 08ef566da763..2db1d94d7dfc 100644 --- a/trunk/kernel/events/uprobes.c +++ b/trunk/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);