Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1432059

[PATCH 4/4] ftrace: Fixup trace_selftest_ops()

Show all headers | View raw

I was hunting a memory leak related to trace_selftest_ops() and found
two small mistakes there.

First, the dynamic trace must be freed in case of error. There was
one wrong goto target. It was even in the original commit
95950c2ecb31314ef ("ftrace: Add self-tests for multiple function
trace users").

Second, ftrace_init_array_ops() is called only when cnt > 1 but
but ftrace_reset_array_ops() is always called. It probably does
not harm but it is strange and might eventually hide a bug.
This was added by the commit 4104d326b670c2 ("ftrace: Remove global
function list and call function directly").

Signed-off-by: Petr Mladek <pmladek@suse.com>
---
 kernel/trace/trace_selftest.c | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
index b0f86ea77881..0b5ae79b5b0c 100644
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
@@ -272,7 +272,7 @@ static int trace_selftest_ops(struct trace_array *tr, int cnt)
 		goto out_free;
 	if (cnt > 1) {
 		if (trace_selftest_test_global_cnt == 0)
-			goto out;
+			goto out_free;
 	}
 	if (trace_selftest_test_dyn_cnt == 0)
 		goto out_free;
@@ -298,9 +298,10 @@ static int trace_selftest_ops(struct trace_array *tr, int cnt)
 	unregister_ftrace_function(&test_probe1);
 	unregister_ftrace_function(&test_probe2);
 	unregister_ftrace_function(&test_probe3);
-	if (cnt > 1)
+	if (cnt > 1) {
 		unregister_ftrace_function(tr->ops);
-	ftrace_reset_array_ops(tr);
+		ftrace_reset_array_ops(tr);
+	}
 
 	/* Make sure everything is off */
 	reset_counts();
-- 
1.8.5.6

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/4] ftrace: One more check on x86 and some small fixes Petr Mladek <pmladek@suse.com> - 2016-06-27 16:00 +0200
  [PATCH 3/4] ftrace: Always destroy trampoline when shutting down the trace Petr Mladek <pmladek@suse.com> - 2016-06-27 16:00 +0200
  [PATCH 2/4] ftrace/x86: Do not crash when reading wrong ftrace func Petr Mladek <pmladek@suse.com> - 2016-06-27 16:00 +0200
    Re: [PATCH 2/4] ftrace/x86: Do not crash when reading wrong ftrace  func Steven Rostedt <rostedt@goodmis.org> - 2016-06-27 16:50 +0200
      Re: [PATCH 2/4] ftrace/x86: Do not crash when reading wrong ftrace  func Petr Mladek <pmladek@suse.com> - 2016-06-28 12:10 +0200
  [PATCH 1/4] ftrace/x86: Make sure to modify 5-bite instructions Petr Mladek <pmladek@suse.com> - 2016-06-27 16:00 +0200
  [PATCH 4/4] ftrace: Fixup trace_selftest_ops() Petr Mladek <pmladek@suse.com> - 2016-06-27 16:00 +0200
  Re: [PATCH 0/4] ftrace: One more check on x86 and some small fixes Namhyung Kim <namhyung@gmail.com> - 2016-06-28 07:30 +0200
  Re: [PATCH 0/4] ftrace: One more check on x86 and some small fixes Steven Rostedt <rostedt@goodmis.org> - 2016-06-28 21:20 +0200
    Re: [PATCH 0/4] ftrace: One more check on x86 and some small fixes Petr Mladek <pmladek@suse.com> - 2016-06-29 10:30 +0200

csiph-web