1 files changed, 16 insertions, 3 deletions

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 7da1dfeb322e..c4de47fc5cca 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -494,8 +494,8 @@ static void remove_event_file_dir(struct ftrace_event_file *file)
         if (dir) {
                 spin_lock(&dir->d_lock);        /* probably unneeded */
                 list_for_each_entry(child, &dir->d_subdirs, d_child) {
-                        if (child->d_inode)     /* probably unneeded */
-                                child->d_inode->i_private = NULL;
+                        if (d_really_is_positive(child))        /* probably unneeded */
+                                d_inode(child)->i_private = NULL;
                 }
                 spin_unlock(&dir->d_lock);
 
@@ -565,6 +565,7 @@ static int __ftrace_set_clr_event(struct trace_array *tr, const char *match,
 static int ftrace_set_clr_event(struct trace_array *tr, char *buf, int set)
 {
         char *event = NULL, *sub = NULL, *match;
+        int ret;
 
         /*
          * The buf format can be <subsystem>:<event-name>
@@ -590,7 +591,13 @@ static int ftrace_set_clr_event(struct trace_array *tr, char *buf, int set)
                         event = NULL;
         }
 
-        return __ftrace_set_clr_event(tr, match, sub, event, set);
+        ret = __ftrace_set_clr_event(tr, match, sub, event, set);
+
+        /* Put back the colon to allow this to be called again */
+        if (buf)
+                *(buf - 1) = ':';
+
+        return ret;
 }
 
 /**
@@ -1753,6 +1760,8 @@ static void update_event_printk(struct ftrace_event_call *call,
                                 ptr++;
                                 /* Check for alpha chars like ULL */
                         } while (isalnum(*ptr));
+                        if (!*ptr)
+                                break;
                         /*
                          * A number must have some kind of delimiter after
                          * it, and we can ignore that too.
@@ -1779,12 +1788,16 @@ static void update_event_printk(struct ftrace_event_call *call,
                         do {
                                 ptr++;
                         } while (isalnum(*ptr) || *ptr == '_');
+                        if (!*ptr)
+                                break;
                         /*
                          * If what comes after this variable is a '.' or
                          * '->' then we can continue to ignore that string.
                          */
                         if (*ptr == '.' || (ptr[0] == '-' && ptr[1] == '>')) {
                                 ptr += *ptr == '.' ? 1 : 2;
+                                if (!*ptr)
+                                        break;
                                 goto skip_more;
                         }
                         /*