diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-27 20:03:15 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-12-27 20:03:15 +0100 |
| commit | 411a678d30ee7c0a5a53d51121c4b51efff98e9d (patch) | |
| tree | aed76ee32025ea3475493fc2903f310d0dd390cf /kernel | |
| parent | Merge tag 'hardening-v6.13-rc5' of git://git.kernel.org/pub/scm/linux/kernel/... (diff) | |
| parent | tracing/kprobe: Make trace_kprobe's module callback called after jump_label u... (diff) | |
| download | linux-411a678d30ee7c0a5a53d51121c4b51efff98e9d.tar.xz linux-411a678d30ee7c0a5a53d51121c4b51efff98e9d.zip | |
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
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/trace_kprobe.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { |