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

torvalds · torvalds · commit 411a678d30ee · 2024-12-27T11:03:15.000-08:00
Pull probes fix from Masami Hiramatsu:
 "Change the priority of the module callback of kprobe events so that it
  is called after the jump label list on the module is updated.

  This ensures the kprobe can check whether it is not on the jump label
  address correctly"

* tag 'probes-fixes-v6.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace:
  tracing/kprobe: Make trace_kprobe's module callback called after jump_label update
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
@@ -725,7 +725,7 @@ static int trace_kprobe_module_callback(struct notifier_block *nb,
 
 static struct notifier_block trace_kprobe_module_nb = {
 	.notifier_call = trace_kprobe_module_callback,
-	.priority = 1	/* Invoked after kprobe module callback */
+	.priority = 2	/* Invoked after kprobe and jump_label module callback */
 };
 static int trace_kprobe_register_module_notifier(void)
 {

Original file line number	Diff line number	Diff line change
`@@ -725,7 +725,7 @@ static int trace_kprobe_module_callback(struct notifier_block *nb,`
`725`	`725`
`726`	`726`	`static struct notifier_block trace_kprobe_module_nb = {`
`727`	`727`	`.notifier_call = trace_kprobe_module_callback,`
`728`		`- .priority = 1 /* Invoked after kprobe module callback */`
	`728`	`+ .priority = 2 /* Invoked after kprobe and jump_label module callback */`
`729`	`729`	`};`
`730`	`730`	`static int trace_kprobe_register_module_notifier(void)`
`731`	`731`	`{`