mirror of
https://github.com/torvalds/linux.git
synced 2026-11-20 13:03:48 +00:00
samples/ftrace: Fix kthread_stop() on ERR_PTR in ftrace-direct-multi-modify
ftrace_direct_multi_init() assigns kthread_run()'s return value to
simple_tsk without an IS_ERR() check. When kthread_run() fails it
returns ERR_PTR(-ENOMEM), but init still returns 0, so the module loads
with simple_tsk holding an error pointer. On unload,
ftrace_direct_multi_exit() then passes that ERR_PTR to kthread_stop(),
leading to a null-pointer-dereference.
Check the return value of kthread_run() with IS_ERR(); on failure,
unregister the ftrace direct call and propagate the error code.
Link: https://patch.msgid.link/[email protected]
Fixes: e1067a07cf ("ftrace/samples: Add module to test multi direct modify interface")
Suggested-by: Steven Rostedt <[email protected]>
Signed-off-by: Haotian Zhang <[email protected]>
Signed-off-by: Steven Rostedt <[email protected]>
This commit is contained in:
committed by
Steven Rostedt
parent
d79fb758e7
commit
6727b7618f
@@ -364,9 +364,15 @@ static int __init ftrace_direct_multi_init(void)
|
||||
|
||||
ret = register_ftrace_direct(&direct, my_tramp);
|
||||
|
||||
if (!ret)
|
||||
simple_tsk = kthread_run(simple_thread, NULL, "event-sample-fn");
|
||||
return ret;
|
||||
if (ret)
|
||||
return ret;
|
||||
simple_tsk = kthread_run(simple_thread, NULL, "event-sample-fn");
|
||||
if (IS_ERR(simple_tsk)) {
|
||||
unregister_ftrace_direct(&direct, my_tramp, true);
|
||||
return PTR_ERR(simple_tsk);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void __exit ftrace_direct_multi_exit(void)
|
||||
|
||||
Reference in New Issue
Block a user