diff options
author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-09-01 12:04:09 -0400 |
---|---|---|
committer | Sasha Levin <alexander.levin@verizon.com> | 2017-10-04 07:43:02 -0400 |
commit | 81c895987a98ee96e989de3465a7e80c4a1778ad (patch) | |
tree | dff5c42ed1e59c6df4097f4102da66b26b362f22 /kernel | |
parent | d1c2fe7dc88d9bc3a477d9dfc2aa623f9776372e (diff) |
ftrace: Fix selftest goto location on error
[ Upstream commit 46320a6acc4fb58f04bcf78c4c942cc43b20f986 ]
In the second iteration of trace_selftest_ops(), the error goto label is
wrong in the case where trace_selftest_test_global_cnt is off. In the
case of error, it leaks the dynamic ops that was allocated.
Cc: stable@vger.kernel.org
Fixes: 95950c2e ("ftrace: Add self-tests for multiple function trace users")
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Signed-off-by: Sasha Levin <alexander.levin@verizon.com>
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/trace/trace_selftest.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c index b0f86ea77881..ca70d11b8aa7 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; |