[GIT PULL] probes: fixes for v6.13-rc4

[Google]

Hi Linus,

Probes fixes for v6.13-rc4:

- tracing/kprobes: 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.


Please pull the latest probes-fixes-v6.13-rc4 tree, which can be found at:


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

Tag SHA1: 6ece68cc0890165bbaa21c511ae76cda688ce43c
Head SHA1: d685d55dfc86b1a4bdcec77c3c1f8a83f181264e


Masami Hiramatsu (Google) (1):
      tracing/kprobe: Make trace_kprobe's module callback called after jump_label update

----
 kernel/trace/trace_kprobe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---------------------------
commit d685d55dfc86b1a4bdcec77c3c1f8a83f181264e
Author: Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>
Date:   Wed Dec 11 09:10:55 2024 +0900

    tracing/kprobe: Make trace_kprobe's module callback called after jump_label update
    
    Make sure the trace_kprobe's module notifer callback function is called
    after jump_label's callback is called. Since the trace_kprobe's callback
    eventually checks jump_label address during registering new kprobe on
    the loading module, jump_label must be updated before this registration
    happens.
    
    Link: https://lore.kernel.org/all/173387585556.995044.3157941002975446119.stgit@devnote2/
    
    Fixes: 614243181050 ("tracing/kprobes: Support module init function probing")
    Signed-off-by: Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index 263fac44d3ca..935a886af40c 100644
--- 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)
 {


-- 
Masami Hiramatsu (Google) <mhiramat@xxxxxxxxxx>