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.c | |
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.c')
-rw-r--r-- | kernel/trace/trace.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c index b90c993462be..10d3f0871b48 100644 --- a/kernel/trace/trace.c +++ b/kernel/trace/trace.c | |||
@@ -240,7 +240,7 @@ static struct tracer *trace_types __read_mostly; | |||
240 | /* | 240 | /* |
241 | * trace_types_lock is used to protect the trace_types list. | 241 | * trace_types_lock is used to protect the trace_types list. |
242 | */ | 242 | */ |
243 | static DEFINE_MUTEX(trace_types_lock); | 243 | DEFINE_MUTEX(trace_types_lock); |
244 | 244 | ||
245 | /* | 245 | /* |
246 | * serialize the access of the ring buffer | 246 | * serialize the access of the ring buffer |