diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-30 15:35:57 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2025-07-30 15:35:57 -0700 |
| commit | a03eec74201251635dede6eb2c3f79c350863d7f (patch) | |
| tree | 03d5b6df5aeddd265803e406d46201a284bfd0b8 | |
| parent | 9bfdba946f30d5cbf2257932a53682c0ad1aeb37 (diff) | |
| parent | a3e892ab0fc287389176eabdcd74234508f6e52d (diff) | |
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()
| -rw-r--r-- | kernel/trace/fprobe.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/trace/fprobe.c b/kernel/trace/fprobe.c index ba7ff14f5339..f9b3aa9afb17 100644 --- a/kernel/trace/fprobe.c +++ b/kernel/trace/fprobe.c @@ -352,7 +352,7 @@ static void fprobe_return(struct ftrace_graph_ret *trace, size_words = SIZE_IN_LONG(size); ret_ip = ftrace_regs_get_instruction_pointer(fregs); - preempt_disable(); + preempt_disable_notrace(); curr = 0; while (size_words > curr) { @@ -368,7 +368,7 @@ static void fprobe_return(struct ftrace_graph_ret *trace, } curr += size; } - preempt_enable(); + preempt_enable_notrace(); } NOKPROBE_SYMBOL(fprobe_return); |