aboutsummaryrefslogtreecommitdiff
path: root/kernel
diff options
context:
space:
mode:
authorJarkko Sakkinen <[email protected]>2020-08-18 08:08:57 +0300
committerSteven Rostedt (VMware) <[email protected]>2020-09-21 21:06:02 -0400
commitf3d36426618ee2b2d1fa99aefb5fe4d2dc33807e (patch)
tree3a2479cb5ecf64837cc2708eb3db4e2865c0d99b /kernel
parentb427e765bdffcc18911ace199a17b09332a47d55 (diff)
kprobes: Use module_name() macro
It is advised to use module_name() macro instead of dereferencing mod->name directly. This makes sense for consistencys sake and also it prevents a hard dependency to CONFIG_MODULES. Link: https://lkml.kernel.org/r/[email protected] Cc: Mark Rutland <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: [email protected] Cc: Andi Kleen <[email protected]> Cc: Ard Biesheuvel <[email protected]> Cc: Jessica Yu <[email protected]> Cc: Mark Rutland <[email protected]>, Cc: Masami Hiramatsu <[email protected]> Cc: Mike Rapoport <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Russell King <[email protected]> Cc: Will Deacon <[email protected]> Acked-by: Masami Hiramatsu <[email protected]> Signed-off-by: Jarkko Sakkinen <[email protected]> Signed-off-by: Steven Rostedt (VMware) <[email protected]>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/trace/trace_kprobe.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index feca9b19cd74..f8e46929ceba 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -106,9 +106,10 @@ static nokprobe_inline bool trace_kprobe_has_gone(struct trace_kprobe *tk)
static nokprobe_inline bool trace_kprobe_within_module(struct trace_kprobe *tk,
struct module *mod)
{
- int len = strlen(mod->name);
+ int len = strlen(module_name(mod));
const char *name = trace_kprobe_symbol(tk);
- return strncmp(mod->name, name, len) == 0 && name[len] == ':';
+
+ return strncmp(module_name(mod), name, len) == 0 && name[len] == ':';
}
static nokprobe_inline bool trace_kprobe_module_exist(struct trace_kprobe *tk)
@@ -688,7 +689,7 @@ static int trace_kprobe_module_callback(struct notifier_block *nb,
if (ret)
pr_warn("Failed to re-register probe %s on %s: %d\n",
trace_probe_name(&tk->tp),
- mod->name, ret);
+ module_name(mod), ret);
}
}
mutex_unlock(&event_mutex);