diff options
author | Alexander Z Lam <azl@google.com> | 2013-07-01 22:37:54 -0400 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-07-25 17:07:43 -0400 |
commit | 9713f78568d0053621530fb9cf06756394b4403c (patch) | |
tree | dba7b16aab7bc4d42bfc686b2f22171fe47cd4de /kernel/trace/trace.h | |
parent | b7f15519edb2e3c3d7d07d6a0780a4386ef23085 (diff) |
tracing: Protect ftrace_trace_arrays list in trace_events.c
commit a82274151af2b075163e3c42c828529dee311487 upstream.
There are multiple places where the ftrace_trace_arrays list is accessed in
trace_events.c without the trace_types_lock held.
Link: http://lkml.kernel.org/r/1372732674-22726-1-git-send-email-azl@google.com
Signed-off-by: Alexander Z Lam <azl@google.com>
Cc: Vaibhav Nagarnaik <vnagarnaik@google.com>
Cc: David Sharp <dhsharp@google.com>
Cc: Alexander Z Lam <lambchop468@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/trace/trace.h')
-rw-r--r-- | kernel/trace/trace.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 20572ed88c5c..7944b9294599 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h | |||
@@ -224,6 +224,8 @@ enum { | |||
224 | 224 | ||
225 | extern struct list_head ftrace_trace_arrays; | 225 | extern struct list_head ftrace_trace_arrays; |
226 | 226 | ||
227 | extern struct mutex trace_types_lock; | ||
228 | |||
227 | /* | 229 | /* |
228 | * The global tracer (top) should be the first trace array added, | 230 | * The global tracer (top) should be the first trace array added, |
229 | * but we check the flag anyway. | 231 | * but we check the flag anyway. |