Commit a03eec74 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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()
parents 9bfdba94 a3e892ab

kernel/trace/fprobe.c

+2 −2
Original line number Diff line number Diff line
@@ -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);