Skip to content

Commit 411a678

Browse files
committed
Merge tag 'probes-fixes-v6.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace
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
2 parents f0bc704 + d685d55 commit 411a678

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

kernel/trace/trace_kprobe.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -725,7 +725,7 @@ static int trace_kprobe_module_callback(struct notifier_block *nb,
725725

726726
static struct notifier_block trace_kprobe_module_nb = {
727727
.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 */
729729
};
730730
static int trace_kprobe_register_module_notifier(void)
731731
{

0 commit comments

Comments
 (0)