projects
/
GitHub
/
LineageOS
/
G12
/
android_kernel_amlogic_linux-4.9.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
d436615
)
uprobes: Copy_insn() should not return -ENOMEM if __copy_insn() fails
author
Oleg Nesterov
<oleg@redhat.com>
Fri, 15 Jun 2012 15:43:44 +0000
(17:43 +0200)
committer
Ingo Molnar
<mingo@kernel.org>
Sat, 16 Jun 2012 07:10:46 +0000
(09:10 +0200)
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
patch
|
blob
|
blame
|
history
diff --git
a/kernel/events/uprobes.c
b/kernel/events/uprobes.c
index 08ef566da7638cb82534bddaeae477c09a4c0058..2db1d94d7dfc90686760b2d1d4eea96a831e7558 100644
(file)
--- 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) {
- i
f (
__copy_insn(mapping, filp, uprobe->arch.insn + nbytes,
- bytes - nbytes, uprobe->offset + nbytes)
)
- return -ENOMEM;
-
+ i
nt 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);