diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-09-20 09:26:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-09-20 09:26:22 -0700 |
| commit | abb91eed948fcdabc7360d57cc3d3a7fba75db67 (patch) | |
| tree | 6d348e52b6f8bc893ab4c838d2a56e7f645e6797 /arch/x86/include | |
| parent | 2f7ff5f5479b020df69feb7493d4012685a8fc96 (diff) | |
| parent | 88aed0422f39b22406f35f1e758cea25e7bbcfb5 (diff) | |
| download | linux-stable-abb91eed948fcdabc7360d57cc3d3a7fba75db67.tar.gz linux-stable-abb91eed948fcdabc7360d57cc3d3a7fba75db67.zip | |
Merge tag 'perf-urgent-2026-09-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull perf events fixes from Ingo Molnar:
- Fix crash when probing CS CALL instructions (Jinke Han)
- Fix NULL pointer crash during module unload (Vinay Belgaumkar)
* tag 'perf-urgent-2026-09-20' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
perf: Fix null pointer access in is_include_guest_event()
x86/kprobes: Fix crash when probing CS CALL instructions
Diffstat (limited to 'arch/x86/include')
| -rw-r--r-- | arch/x86/include/asm/text-patching.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/include/asm/text-patching.h b/arch/x86/include/asm/text-patching.h index f2d142a0a..ea0938107 100644 --- a/arch/x86/include/asm/text-patching.h +++ b/arch/x86/include/asm/text-patching.h @@ -164,9 +164,9 @@ unsigned long int3_emulate_pop(struct pt_regs *regs) } static __always_inline -void int3_emulate_call(struct pt_regs *regs, unsigned long func) +void int3_emulate_call(struct pt_regs *regs, unsigned long ip, unsigned long func) { - int3_emulate_push(regs, regs->ip - INT3_INSN_SIZE + CALL_INSN_SIZE); + int3_emulate_push(regs, ip); int3_emulate_jmp(regs, func); } |