ftrace: Fix selftest goto location on error

BugLink: http://bugs.launchpad.net/bugs/1720154
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/kernel/trace/trace_selftest.c b/kernel/trace/trace_selftest.c
index cb917cebae291bfbf00a86ea67e69d151b626e27..b17ec642793bc327e56f14d433a725dcff330f78 100644 (file)
--- a/kernel/trace/trace_selftest.c
+++ b/kernel/trace/trace_selftest.c
@@ -273,7 +273,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;