diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2017-09-01 12:04:09 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-09-27 14:43:18 +0200 |
| commit | c0b8a375da604fa4a8a126dbabad0bc7f5c53939 (patch) | |
| tree | 491654e52c914c52cb049bc7077a83f99ec83cbe /kernel | |
| parent | 5295fb6059c86f318368211c74390c22318f398f (diff) | |
| download | talos-obmc-linux-c0b8a375da604fa4a8a126dbabad0bc7f5c53939.tar.gz talos-obmc-linux-c0b8a375da604fa4a8a126dbabad0bc7f5c53939.zip | |
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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 cb917cebae29..b17ec642793b 100644 --- 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; |
