| From 9fbc01cdba66e988122ccdc6094cfd85d9587769 Mon Sep 17 00:00:00 2001 |
| From: Kefeng Wang <wangkefeng.wang@huawei.com> |
| Date: Tue, 9 Jun 2020 13:52:00 +0000 |
| Subject: sample-trace-array: Remove trace_array 'sample-instance' |
| |
| From: Kefeng Wang <wangkefeng.wang@huawei.com> |
| |
| commit 9fbc01cdba66e988122ccdc6094cfd85d9587769 upstream. |
| |
| Remove trace_array 'sample-instance' if kthread_run fails |
| in sample_trace_array_init(). |
| |
| Link: https://lkml.kernel.org/r/20200609135200.2206726-1-wangkefeng.wang@huawei.com |
| |
| Cc: stable@vger.kernel.org |
| Fixes: 89ed42495ef4a ("tracing: Sample module to demonstrate kernel access to Ftrace instances.") |
| Reviewed-by: Divya Indi <divya.indi@oracle.com> |
| Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com> |
| Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| |
| --- |
| samples/ftrace/sample-trace-array.c | 6 +++++- |
| 1 file changed, 5 insertions(+), 1 deletion(-) |
| |
| --- a/samples/ftrace/sample-trace-array.c |
| +++ b/samples/ftrace/sample-trace-array.c |
| @@ -107,8 +107,12 @@ static int __init sample_trace_array_ini |
| trace_printk_init_buffers(); |
| |
| simple_tsk = kthread_run(simple_thread, NULL, "sample-instance"); |
| - if (IS_ERR(simple_tsk)) |
| + if (IS_ERR(simple_tsk)) { |
| + trace_array_put(tr); |
| + trace_array_destroy(tr); |
| return -1; |
| + } |
| + |
| return 0; |
| } |
| |
