diff options
| author |   Masami Hiramatsu <mhiramat@kernel.org> | 2021-09-14 23:40:36 +0900 |
|---|---|---|
| committer |   Steven Rostedt (VMware) <rostedt@goodmis.org> | 2021-09-30 21:24:06 -0400 |
| commit | f2ec8d9a3b8c0f22cd6a2b4f5a2d9aee5206e3b7 (patch) | |
| tree | 062bc0312dc8c349e621742940d6a4345b747aa2 /lib/error-inject.c | |
| parent | ia64: kprobes: Fix to pass correct trampoline address to the handler (diff) | |
| download | linux-dev-f2ec8d9a3b8c0f22cd6a2b4f5a2d9aee5206e3b7.tar.xz linux-dev-f2ec8d9a3b8c0f22cd6a2b4f5a2d9aee5206e3b7.zip | |
kprobes: treewide: Replace arch_deref_entry_point() with dereference_symbol_descriptor()
~15 years ago kprobes grew the 'arch_deref_entry_point()' __weak function:
3d7e33825d87: ("jprobes: make jprobes a little safer for users")
But this is just open-coded dereference_symbol_descriptor() in essence, and
its obscure nature was causing bugs.
Just use the real thing and remove arch_deref_entry_point().
Link: https://lkml.kernel.org/r/163163043630.489837.7924988885652708696.stgit@devnote2
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Tested-by: Andrii Nakryiko <andrii@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'lib/error-inject.c')
| -rw-r--r-- | lib/error-inject.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/error-inject.c b/lib/error-inject.c index c73651b15b76..2ff5ef689d72 100644 --- a/lib/error-inject.c +++ b/lib/error-inject.c @@ -8,6 +8,7 @@ #include <linux/mutex.h> #include <linux/list.h> #include <linux/slab.h> +#include <asm/sections.h> /* Whitelist of symbols that can be overridden for error injection. */ static LIST_HEAD(error_injection_list); @@ -64,7 +65,7 @@ static void populate_error_injection_list(struct error_injection_entry *start, mutex_lock(&ei_mutex); for (iter = start; iter < end; iter++) { - entry = arch_deref_entry_point((void *)iter->addr); + entry = (unsigned long)dereference_symbol_descriptor((void *)iter->addr); if (!kernel_text_address(entry) || !kallsyms_lookup_size_offset(entry, &size, &offset)) { |