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

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

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: 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/20120615154344.GA9601@redhat.com


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

kernel/events/uprobes.c

+4 −4
Original line number Diff line number Diff line
@@ -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);