From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753848AbZCBUaj (ORCPT ); Mon, 2 Mar 2009 15:30:39 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751618AbZCBUa2 (ORCPT ); Mon, 2 Mar 2009 15:30:28 -0500 Received: from hrndva-omtalb.mail.rr.com ([71.74.56.122]:35939 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750882AbZCBUa1 (ORCPT ); Mon, 2 Mar 2009 15:30:27 -0500 Message-Id: <20090302203024.132325230@goodmis.org> References: <20090302202925.364437449@goodmis.org> User-Agent: quilt/0.46-1 Date: Mon, 02 Mar 2009 15:29:27 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Ingo Molnar , Andrew Morton , Peter Zijlstra , Frederic Weisbecker , Theodore Tso , Mathieu Desnoyers , Tom Zanussi , Masami Hiramatsu , KOSAKI Motohiro , Jason Baron , "Frank Ch. Eigler" , Arnaldo Carvalho de Melo , Steven Rostedt Subject: [PATCH 2/7] tracing: add protection around modify trace event fields Content-Disposition: inline; filename=0002-tracing-add-protection-around-modify-trace-event-fi.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Steven Rostedt 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 --- kernel/trace/trace_events.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c index 1d07f80..26069fa 100644 --- a/kernel/trace/trace_events.c +++ b/kernel/trace/trace_events.c @@ -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; \ @@ -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) @@ -124,6 +127,8 @@ static int ftrace_set_clr_event(char *buf, int set) ret = 0; } + mutex_unlock(&event_mutex); + return ret; } @@ -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: -- 1.5.6.5 --