diff options
| author | zhangyi (F) <yi.zhang@huawei.com> | 2019-02-13 20:29:06 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-03-23 20:11:17 +0100 |
| commit | aca126f4a451b36fc6841d7bf76b3a5f4e5d3b01 (patch) | |
| tree | 9e6aaa18854dfb268a94e89847b54bb7d0fba556 /kernel | |
| parent | e5cde571ee5fef726d62a013c7aeef53705dfd32 (diff) | |
| download | blackbird-obmc-linux-aca126f4a451b36fc6841d7bf76b3a5f4e5d3b01.tar.gz blackbird-obmc-linux-aca126f4a451b36fc6841d7bf76b3a5f4e5d3b01.zip | |
tracing: Do not free iter->trace in fail path of tracing_open_pipe()
commit e7f0c424d0806b05d6f47be9f202b037eb701707 upstream.
Commit d716ff71dd12 ("tracing: Remove taking of trace_types_lock in
pipe files") use the current tracer instead of the copy in
tracing_open_pipe(), but it forget to remove the freeing sentence in
the error path.
There's an error path that can call kfree(iter->trace) after the iter->trace
was assigned to tr->current_trace, which would be bad to free.
Link: http://lkml.kernel.org/r/1550060946-45984-1-git-send-email-yi.zhang@huawei.com
Cc: stable@vger.kernel.org
Fixes: d716ff71dd12 ("tracing: Remove taking of trace_types_lock in pipe files")
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
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.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index c4238b441624..5f40db27aaf2 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -5626,7 +5626,6 @@ out: return ret; fail: - kfree(iter->trace); kfree(iter); __trace_array_put(tr); mutex_unlock(&trace_types_lock); |
