Skip to content

Commit

Permalink
tracing: add protection around modify trace event fields
Browse files Browse the repository at this point in the history
The trace event objects are currently not proctected against
reentrancy. This patch adds a mutex around the modifications of
the trace event fields.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
  • Loading branch information
Steven Rostedt committed Mar 2, 2009
1 parent d20e3b0 commit 11a241a
Showing 1 changed file with 7 additions and 0 deletions.
7 changes: 7 additions & 0 deletions kernel/trace/trace_events.c
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

#define TRACE_SYSTEM "TRACE_SYSTEM"

static DEFINE_MUTEX(event_mutex);

#define events_for_each(event) \
for (event = __start_ftrace_events; \
(unsigned long)event < (unsigned long)__stop_ftrace_events; \
Expand Down Expand Up @@ -104,6 +106,7 @@ static int ftrace_set_clr_event(char *buf, int set)
event = NULL;
}

mutex_lock(&event_mutex);
events_for_each(call) {

if (!call->name)
Expand All @@ -124,6 +127,8 @@ static int ftrace_set_clr_event(char *buf, int set)

ret = 0;
}
mutex_unlock(&event_mutex);

return ret;
}

Expand Down Expand Up @@ -324,7 +329,9 @@ event_enable_write(struct file *filp, const char __user *ubuf, size_t cnt,
switch (val) {
case 0:
case 1:
mutex_lock(&event_mutex);
ftrace_event_enable_disable(call, val);
mutex_unlock(&event_mutex);
break;

default:
Expand Down

0 comments on commit 11a241a

Please sign in to comment.