Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull kprobes fixes from Ingo Molnar:
"Two kprobes fixes: a blacklist fix and an instruction patching related
corruption fix"
* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
kprobes/x86: Blacklist non-attachable interrupt functions
kprobes/x86: Fix instruction patching corruption when copying more than one RIP-relative instruction
+5
-1
+4
arch/x86/entry/entry_64.S
+4
arch/x86/entry/entry_64.S
···
566
566
567
567
ret
568
568
END(interrupt_entry)
569
+
_ASM_NOKPROBE(interrupt_entry)
569
570
570
571
571
572
/* Interrupt entry/exit. */
···
767
766
jmp native_irq_return_iret
768
767
#endif
769
768
END(common_interrupt)
769
+
_ASM_NOKPROBE(common_interrupt)
770
770
771
771
/*
772
772
* APIC interrupts.
···
782
780
call \do_sym /* rdi points to pt_regs */
783
781
jmp ret_from_intr
784
782
END(\sym)
783
+
_ASM_NOKPROBE(\sym)
785
784
.endm
786
785
787
786
/* Make sure APIC interrupt handlers end up in the irqentry section: */
···
963
960
964
961
jmp error_exit
965
962
.endif
963
+
_ASM_NOKPROBE(\sym)
966
964
END(\sym)
967
965
.endm
968
966
+1
-1
arch/x86/kernel/kprobes/opt.c
+1
-1
arch/x86/kernel/kprobes/opt.c
···
189
189
int len = 0, ret;
190
190
191
191
while (len < RELATIVEJUMP_SIZE) {
192
-
ret = __copy_instruction(dest + len, src + len, real, &insn);
192
+
ret = __copy_instruction(dest + len, src + len, real + len, &insn);
193
193
if (!ret || !can_boost(&insn, src + len))
194
194
return -EINVAL;
195
195
len += ret;