diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2020-07-02 15:51:48 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2020-07-02 15:51:48 +0200 |
| commit | 78c2141b654375079e3737f06f19cabfc0fcecd7 (patch) | |
| tree | 5068a6c2904d93b61b37243ea39b728fe621196e /arch/x86/kernel/kprobes/opt.c | |
| parent | bb42b3d39781d7fcd3be7f9f9bf11b6661b5fdf1 (diff) | |
| parent | e1ad1ac2deb8f90af9f12ff316989dd5675dec11 (diff) | |
Merge branch 'perf/vlbr'
Diffstat (limited to 'arch/x86/kernel/kprobes/opt.c')
| -rw-r--r-- | arch/x86/kernel/kprobes/opt.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/kprobes/opt.c b/arch/x86/kernel/kprobes/opt.c index 3239b6a80bce..40f380461e6d 100644 --- a/arch/x86/kernel/kprobes/opt.c +++ b/arch/x86/kernel/kprobes/opt.c @@ -57,7 +57,7 @@ found: * overwritten by jump destination address. In this case, original * bytes must be recovered from op->optinsn.copied_insn buffer. */ - if (probe_kernel_read(buf, (void *)addr, + if (copy_from_kernel_nofault(buf, (void *)addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t))) return 0UL; |