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

torvalds · torvalds · commit a03eec742012 · 2025-07-30T15:35:57.000-07:00
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()
diff --git 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);
 

Original file line number	Diff line number	Diff line change
`@@ -352,7 +352,7 @@ static void fprobe_return(struct ftrace_graph_ret *trace,`
`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,7 +368,7 @@ static void fprobe_return(struct ftrace_graph_ret *trace,`
`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`