Skip to content

Commit

Permalink
ftrace: use probe_kernel
Browse files Browse the repository at this point in the history
Andrew Morton suggested using the proper API for reading and writing
kernel areas that might fault.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Steven Rostedt authored and Ingo Molnar committed Oct 23, 2008
1 parent 76aefee commit ab9a091
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions arch/x86/kernel/ftrace.c
Original file line number Diff line number Diff line change
Expand Up @@ -67,24 +67,22 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code,
* Note: Due to modules and __init, code can
* disappear and change, we need to protect against faulting
* as well as code changing. We do this by using the
* __copy_*_user functions.
* probe_kernel_* functions.
*
* No real locking needed, this code is run through
* kstop_machine, or before SMP starts.
*/

/* read the text we want to modify */
if (__copy_from_user_inatomic(replaced, (char __user *)ip,
MCOUNT_INSN_SIZE))
if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE))
return -EFAULT;

/* Make sure it is what we expect it to be */
if (memcmp(replaced, old_code, MCOUNT_INSN_SIZE) != 0)
return -EINVAL;

/* replace the text with the new text */
if (__copy_to_user_inatomic((char __user *)ip, new_code,
MCOUNT_INSN_SIZE))
if (probe_kernel_write((void *)ip, new_code, MCOUNT_INSN_SIZE))
return -EPERM;

sync_core();
Expand Down

0 comments on commit ab9a091

Please sign in to comment.