1 files changed, 10 insertions, 1 deletions

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index bf56c1d07df3..f82d92dbd614 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -1011,6 +1011,7 @@ static int subsystem_open(struct inode *inode, struct file *filp)
         int ret;
 
         /* Make sure the system still exists */
+        mutex_lock(&trace_types_lock);
         mutex_lock(&event_mutex);
         list_for_each_entry(tr, &ftrace_trace_arrays, list) {
                 list_for_each_entry(dir, &tr->systems, list) {
@@ -1026,6 +1027,7 @@ static int subsystem_open(struct inode *inode, struct file *filp)
         }
  exit_loop:
         mutex_unlock(&event_mutex);
+        mutex_unlock(&trace_types_lock);
 
         if (!system)
                 return -ENODEV;
@@ -1620,6 +1622,7 @@ static void __add_event_to_tracers(struct ftrace_event_call *call,
 int trace_add_event_call(struct ftrace_event_call *call)
 {
         int ret;
+        mutex_lock(&trace_types_lock);
         mutex_lock(&event_mutex);
 
         ret = __register_event(call, NULL);
@@ -1627,11 +1630,13 @@ int trace_add_event_call(struct ftrace_event_call *call)
                 __add_event_to_tracers(call, NULL);
 
         mutex_unlock(&event_mutex);
+        mutex_unlock(&trace_types_lock);
         return ret;
 }
 
 /*
- * Must be called under locking both of event_mutex and trace_event_sem.
+ * Must be called under locking of trace_types_lock, event_mutex and
+ * trace_event_sem.
  */
 static void __trace_remove_event_call(struct ftrace_event_call *call)
 {
@@ -1643,11 +1648,13 @@ static void __trace_remove_event_call(struct ftrace_event_call *call)
 /* Remove an event_call */
 void trace_remove_event_call(struct ftrace_event_call *call)
 {
+        mutex_lock(&trace_types_lock);
         mutex_lock(&event_mutex);
         down_write(&trace_event_sem);
         __trace_remove_event_call(call);
         up_write(&trace_event_sem);
         mutex_unlock(&event_mutex);
+        mutex_unlock(&trace_types_lock);
 }
 
 #define for_each_event(event, start, end)                       \
@@ -1791,6 +1798,7 @@ static int trace_module_notify(struct notifier_block *self,
 {
         struct module *mod = data;
 
+        mutex_lock(&trace_types_lock);
         mutex_lock(&event_mutex);
         switch (val) {
         case MODULE_STATE_COMING:
@@ -1801,6 +1809,7 @@ static int trace_module_notify(struct notifier_block *self,
                 break;
         }
         mutex_unlock(&event_mutex);
+        mutex_unlock(&trace_types_lock);
 
         return 0;
 }