Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

Merge tag 'probes-fixes-v6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace

Pull probes fix from Masami Hiramatsu:

- Fix a potential infinite recursion in fprobe by using preempt_*_notrace()

* tag 'probes-fixes-v6.16' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
tracing: fprobe: Fix infinite recursion using preempt_*_notrace()

+2 -2
+2 -2
kernel/trace/fprobe.c
··· 352 352 size_words = SIZE_IN_LONG(size); 353 353 ret_ip = ftrace_regs_get_instruction_pointer(fregs); 354 354 355 - preempt_disable(); 355 + preempt_disable_notrace(); 356 356 357 357 curr = 0; 358 358 while (size_words > curr) { ··· 368 368 } 369 369 curr += size; 370 370 } 371 - preempt_enable(); 371 + preempt_enable_notrace(); 372 372 } 373 373 NOKPROBE_SYMBOL(fprobe_return); 374 374