ftrace: Fix selftest goto location on error

commit 46320a6acc4fb58f04bcf78c4c942cc43b20f986 upstream.

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.

Fixes: 95950c2e ("ftrace: Add self-tests for multiple function trace users")
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
[bwh: Backported to 3.2: adjust context, indentation]
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
index 09fd98a..4f2845c 100644 (file)
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
@@ -257,7 +257,7 @@ static int trace_selftest_ops(int cnt)
        if (trace_selftest_test_probe3_cnt != 3)
                goto out_free;
        if (trace_selftest_test_global_cnt == 0)
-               goto out;
+               goto out_free;
        if (trace_selftest_test_dyn_cnt == 0)
                goto out_free;