diff options
| -rw-r--r-- | arch/x86/kernel/ftrace.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/x86/kernel/ftrace.c b/arch/x86/kernel/ftrace.c index 783455454d78..da4fb0deecf7 100644 --- a/arch/x86/kernel/ftrace.c +++ b/arch/x86/kernel/ftrace.c | |||
| @@ -67,15 +67,14 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code, | |||
| 67 | * Note: Due to modules and __init, code can | 67 | * Note: Due to modules and __init, code can |
| 68 | * disappear and change, we need to protect against faulting | 68 | * disappear and change, we need to protect against faulting |
| 69 | * as well as code changing. We do this by using the | 69 | * as well as code changing. We do this by using the |
| 70 | * __copy_*_user functions. | 70 | * probe_kernel_* functions. |
| 71 | * | 71 | * |
| 72 | * No real locking needed, this code is run through | 72 | * No real locking needed, this code is run through |
| 73 | * kstop_machine, or before SMP starts. | 73 | * kstop_machine, or before SMP starts. |
| 74 | */ | 74 | */ |
| 75 | 75 | ||
| 76 | /* read the text we want to modify */ | 76 | /* read the text we want to modify */ |
| 77 | if (__copy_from_user_inatomic(replaced, (char __user *)ip, | 77 | if (probe_kernel_read(replaced, (void *)ip, MCOUNT_INSN_SIZE)) |
| 78 | MCOUNT_INSN_SIZE)) | ||
| 79 | return -EFAULT; | 78 | return -EFAULT; |
| 80 | 79 | ||
| 81 | /* Make sure it is what we expect it to be */ | 80 | /* Make sure it is what we expect it to be */ |
| @@ -83,8 +82,7 @@ ftrace_modify_code(unsigned long ip, unsigned char *old_code, | |||
| 83 | return -EINVAL; | 82 | return -EINVAL; |
| 84 | 83 | ||
| 85 | /* replace the text with the new text */ | 84 | /* replace the text with the new text */ |
| 86 | if (__copy_to_user_inatomic((char __user *)ip, new_code, | 85 | if (probe_kernel_write((void *)ip, new_code, MCOUNT_INSN_SIZE)) |
| 87 | MCOUNT_INSN_SIZE)) | ||
| 88 | return -EPERM; | 86 | return -EPERM; |
| 89 | 87 | ||
| 90 | sync_core(); | 88 | sync_core(); |