public inbox for [email protected]
 help / color / mirror / Atom feed
* [PATCH] tracing: Fix possible crash in ftrace_free_ftrace_ops()
@ 2022-05-08 16:18 Jeff Xie
  2022-05-09  1:33 ` Jeff Xie
  0 siblings, 1 reply; 3+ messages in thread
From: Jeff Xie @ 2022-05-08 16:18 UTC (permalink / raw)
  To: rostedt; +Cc: mingo, mhiramat, zanussi, linux-kernel, Jeff Xie

Currently if the ftrace_allocate_ftrace_ops() return -ENOMEM,
the ftrace_free_ftrace_ops() will kfree(NULL).
 
trace_array_create()
{
	...
	if (ftrace_allocate_ftrace_ops(tr) < 0)
		goto out_free_tr;
	...
out_free_tr:
        ftrace_free_ftrace_ops(tr);
	...
}

ftrace_allocate_ftrace_ops()
{
	...
	ops = kzalloc(sizeof(*ops), GFP_KERNEL);
        if (!ops)
                return -ENOMEM;
	...
}

ftrace_free_ftrace_ops()
{
        kfree(tr->ops);
        tr->ops = NULL;
}

Signed-off-by: Jeff Xie <[email protected]>
---
 kernel/trace/trace_functions.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/kernel/trace/trace_functions.c b/kernel/trace/trace_functions.c
index 9f1bfbe105e8..d186d6101695 100644
--- a/kernel/trace/trace_functions.c
+++ b/kernel/trace/trace_functions.c
@@ -73,6 +73,9 @@ int ftrace_allocate_ftrace_ops(struct trace_array *tr)
 
 void ftrace_free_ftrace_ops(struct trace_array *tr)
 {
+	if (!tr->ops)
+		return;
+
 	kfree(tr->ops);
 	tr->ops = NULL;
 }
-- 
2.25.1



^ permalink raw reply related	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2022-05-09  7:51 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-08 16:18 [PATCH] tracing: Fix possible crash in ftrace_free_ftrace_ops() Jeff Xie
2022-05-09  1:33 ` Jeff Xie
2022-05-09  7:34   ` Ammar Faizi

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox