Commit 411a678d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'probes-fixes-v6.13-rc4' of... 

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
parents f0bc704f d685d55d

kernel/trace/trace_kprobe.c

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

{