diff options
| author | Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com> | 2014-06-03 13:28:03 +0900 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-06-03 19:58:31 -0400 |
| commit | 198376cd8877a612cc6494201b815c36d1e40391 (patch) | |
| tree | 04f842baddd222fdaa5f0ca71b5c7a6b94a3496d | |
| parent | 964f7b6b785651a75ef1cbad43a393ca52d4b4f7 (diff) | |
| download | op-kernel-dev-198376cd8877a612cc6494201b815c36d1e40391.zip op-kernel-dev-198376cd8877a612cc6494201b815c36d1e40391.tar.gz | |
tracing: Eliminate double free on failure of allocation on boot up
If allocation of the max_buffer fails on boot up, the error path will
free both per_cpu data structures from the buffers. With the new redesign
of the code, those structures are freed if allocations failed. That is,
the helper function that allocates the buffers will free the per cpu data
on failure. No need to do it again. In fact, the second free will cause
a bug as the code can not handle a double free.
Link: http://lkml.kernel.org/p/20140603042803.27308.30956.stgit@yunodevel
Signed-off-by: Yoshihiro YUNOMAE <yoshihiro.yunomae.ez@hitachi.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | kernel/trace/trace.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index 626dbfd..135af32 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c @@ -6671,10 +6671,6 @@ __init static int tracer_alloc_buffers(void) out_free_temp_buffer: ring_buffer_free(temp_buffer); out_free_cpumask: - free_percpu(global_trace.trace_buffer.data); -#ifdef CONFIG_TRACER_MAX_TRACE - free_percpu(global_trace.max_buffer.data); -#endif free_cpumask_var(global_trace.tracing_cpumask); out_free_buffer_mask: free_cpumask_var(tracing_buffer_mask); |
