diff options
| author | Masami Hiramatsu (Google) <mhiramat@kernel.org> | 2022-10-23 11:11:43 +0900 |
|---|---|---|
| committer | Masami Hiramatsu (Google) <mhiramat@kernel.org> | 2022-11-04 08:50:07 +0900 |
| commit | 61b304b73ab4b48b1cd7796efe42a570e2a0e0fc (patch) | |
| tree | b650c933b3d1d1d6fd4212ab6ac3524f895342bc /kernel | |
| parent | d05ea35e7eea14d32f29fd688d3daeb9089de1a5 (diff) | |
| download | lwn-61b304b73ab4b48b1cd7796efe42a570e2a0e0fc.tar.gz lwn-61b304b73ab4b48b1cd7796efe42a570e2a0e0fc.zip | |
tracing/fprobe: Fix to check whether fprobe is registered correctly
Since commit ab51e15d535e ("fprobe: Introduce FPROBE_FL_KPROBE_SHARED flag
for fprobe") introduced fprobe_kprobe_handler() for fprobe::ops::func,
unregister_fprobe() fails to unregister the registered if user specifies
FPROBE_FL_KPROBE_SHARED flag.
Moreover, __register_ftrace_function() is possible to change the
ftrace_ops::func, thus we have to check fprobe::ops::saved_func instead.
To check it correctly, it should confirm the fprobe::ops::saved_func is
either fprobe_handler() or fprobe_kprobe_handler().
Link: https://lore.kernel.org/all/166677683946.1459107.15997653945538644683.stgit@devnote3/
Fixes: cad9931f64dc ("fprobe: Add ftrace based probe APIs")
Cc: stable@vger.kernel.org
Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/trace/fprobe.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/trace/fprobe.c b/kernel/trace/fprobe.c index 71614b2a67ff..e8143e368074 100644 --- a/kernel/trace/fprobe.c +++ b/kernel/trace/fprobe.c @@ -303,7 +303,8 @@ int unregister_fprobe(struct fprobe *fp) { int ret; - if (!fp || fp->ops.func != fprobe_handler) + if (!fp || (fp->ops.saved_func != fprobe_handler && + fp->ops.saved_func != fprobe_kprobe_handler)) return -EINVAL; /* |