Skip to content

Commit

Permalink
tracing/uprobes: Fix to return -EFAULT if copy_from_user failed
Browse files Browse the repository at this point in the history
Fix probe_mem_read() to return -EFAULT if copy_from_user()
failed. The copy_from_user() returns remaining bytes
when it failed, but probe_mem_read() caller expects it
returns error code like as probe_kernel_read().

Link: http://lkml.kernel.org/r/153547306719.26502.8353484532699160223.stgit@devbox

Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
  • Loading branch information
Masami Hiramatsu authored and Steven Rostedt (VMware) committed Oct 11, 2018
1 parent a1303af commit f3f5893
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion kernel/trace/trace_uprobe.c
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ probe_mem_read(void *dest, void *src, size_t size)
{
void __user *vaddr = (void __force __user *)src;

return copy_from_user(dest, vaddr, size);
return copy_from_user(dest, vaddr, size) ? -EFAULT : 0;
}
/*
* Fetch a null-terminated string. Caller MUST set *(u32 *)dest with max
Expand Down

0 comments on commit f3f5893

Please sign in to comment.