kprobes: Use module_name() macro (e9ffc8c1) · Commits · 戴 / test

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. Signed-off-by:

Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> Signed-off-by:

Steven Rostedt (VMware) <rostedt@goodmis.org> Signed-off-by:

Peter Zijlstra (Intel) <peterz@infradead.org> Acked-by:

Masami Hiramatsu <mhiramat@kernel.org> Link: https://lkml.kernel.org/r/20200818050857.117998-1-jarkko.sakkinen@linux.intel.com

kernel/trace/trace_kprobe.c

+4 −3

Original line number	Diff line number	Diff line
		@@ -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);

Admin message