diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2018-12-28 04:54:10 +0100 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2018-12-28 04:54:10 +0100 |
| commit | 4b5f747e82b12b6d8ab815fc259827a615c7f2c3 (patch) | |
| tree | ec5eb3857bbb776ac521f555978fcb78cc6bd2a8 /arch/x86/kernel/kprobes/opt.c | |
| parent | libnvdimm/security: Quiet security operations (diff) | |
| parent | libnvdimm, namespace: Replace kmemdup() with kstrndup() (diff) | |
| download | linux-4b5f747e82b12b6d8ab815fc259827a615c7f2c3.tar.xz linux-4b5f747e82b12b6d8ab815fc259827a615c7f2c3.zip | |
Merge miscellaneous libnvdimm updates for 4.21
* Use common helpers, bitmap_zalloc() and kstrndup(), to replace open
coded versions.
* Clarify the comments around hotplug vs initial init case for the nfit
driver.
* Cleanup the libnvdimm init path.
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 40b16b270656..6adf6e6c2933 100644 --- a/arch/x86/kernel/kprobes/opt.c +++ b/arch/x86/kernel/kprobes/opt.c @@ -189,7 +189,7 @@ static int copy_optimized_instructions(u8 *dest, u8 *src, u8 *real) int len = 0, ret; while (len < RELATIVEJUMP_SIZE) { - ret = __copy_instruction(dest + len, src + len, real, &insn); + ret = __copy_instruction(dest + len, src + len, real + len, &insn); if (!ret || !can_boost(&insn, src + len)) return -EINVAL; len += ret; |