Skip to content

Commit 7381f24

Browse files
committed
fprobe: Release rethook after the ftrace_ops is unregistered
JIRA: https://issues.redhat.com/browse/RHEL-26131 commit 5f81018 Author: Jiri Olsa <jolsa@kernel.org> Date: Thu Jun 15 13:52:36 2023 +0200 fprobe: Release rethook after the ftrace_ops is unregistered While running bpf selftests it's possible to get following fault: general protection fault, probably for non-canonical address \ 0x6b6b6b6b6b6b6b6b: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC NOPTI ... Call Trace: <TASK> fprobe_handler+0xc1/0x270 ? __pfx_bpf_testmod_init+0x10/0x10 ? __pfx_bpf_testmod_init+0x10/0x10 ? bpf_fentry_test1+0x5/0x10 ? bpf_fentry_test1+0x5/0x10 ? bpf_testmod_init+0x22/0x80 ? do_one_initcall+0x63/0x2e0 ? rcu_is_watching+0xd/0x40 ? kmalloc_trace+0xaf/0xc0 ? do_init_module+0x60/0x250 ? __do_sys_finit_module+0xac/0x120 ? do_syscall_64+0x37/0x90 ? entry_SYSCALL_64_after_hwframe+0x72/0xdc </TASK> In unregister_fprobe function we can't release fp->rethook while it's possible there are some of its users still running on another cpu. Moving rethook_free call after fp->ops is unregistered with unregister_ftrace_function call. Link: https://lore.kernel.org/all/20230615115236.3476617-1-jolsa@kernel.org/ Fixes: 5b0ab78 ("fprobe: Add exit_handler support") Cc: stable@vger.kernel.org Reviewed-by: Steven Rostedt (Google) <rostedt@goodmis.org> Signed-off-by: Jiri Olsa <jolsa@kernel.org> Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Signed-off-by: Masami Hiramatsu (Google) <mhiramat@kernel.org> Signed-off-by: Viktor Malik <vmalik@redhat.com>
1 parent e490777 commit 7381f24

File tree

1 file changed

+3
-9
lines changed

1 file changed

+3
-9
lines changed

kernel/trace/fprobe.c

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -349,19 +349,13 @@ int unregister_fprobe(struct fprobe *fp)
349349
fp->ops.saved_func != fprobe_kprobe_handler))
350350
return -EINVAL;
351351

352-
/*
353-
* rethook_free() starts disabling the rethook, but the rethook handlers
354-
* may be running on other processors at this point. To make sure that all
355-
* current running handlers are finished, call unregister_ftrace_function()
356-
* after this.
357-
*/
358-
if (fp->rethook)
359-
rethook_free(fp->rethook);
360-
361352
ret = unregister_ftrace_function(&fp->ops);
362353
if (ret < 0)
363354
return ret;
364355

356+
if (fp->rethook)
357+
rethook_free(fp->rethook);
358+
365359
ftrace_free_filter(&fp->ops);
366360

367361
return ret;

0 commit comments

Comments
 (0)