5 files changed, 26 insertions, 8 deletions

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 91eecaaa43e0..05330494a0df 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -6079,7 +6079,7 @@ trace_create_cpu_file(const char *name, umode_t mode, struct dentry *parent,
         struct dentry *ret = trace_create_file(name, mode, parent, data, fops);
 
         if (ret) /* See tracing_get_cpu() */
-                ret->d_inode->i_cdev = (void *)(cpu + 1);
+                d_inode(ret)->i_cdev = (void *)(cpu + 1);
         return ret;
 }
 
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;
                         }
                         /*
diff --git a/kernel/trace/trace_functions_graph.c b/kernel/trace/trace_functions_graph.c
index 9cfea4c6d314..a51e79688455 100644
--- a/kernel/trace/trace_functions_graph.c
+++ b/kernel/trace/trace_functions_graph.c
@@ -1308,15 +1308,19 @@ void graph_trace_open(struct trace_iterator *iter)
 {
         /* pid and depth on the last trace processed */
         struct fgraph_data *data;
+        gfp_t gfpflags;
         int cpu;
 
         iter->private = NULL;
 
-        data = kzalloc(sizeof(*data), GFP_KERNEL);
+        /* We can be called in atomic context via ftrace_dump() */
+        gfpflags = (in_atomic() || irqs_disabled()) ? GFP_ATOMIC : GFP_KERNEL;
+
+        data = kzalloc(sizeof(*data), gfpflags);
         if (!data)
                 goto out_err;
 
-        data->cpu_data = alloc_percpu(struct fgraph_cpu_data);
+        data->cpu_data = alloc_percpu_gfp(struct fgraph_cpu_data, gfpflags);
         if (!data->cpu_data)
                 goto out_err_free;
 
diff --git a/kernel/trace/trace_output.c b/kernel/trace/trace_output.c
index 692bf7184c8c..25a086bcb700 100644
--- a/kernel/trace/trace_output.c
+++ b/kernel/trace/trace_output.c
@@ -178,12 +178,13 @@ ftrace_print_hex_seq(struct trace_seq *p, const unsigned char *buf, int buf_len)
 EXPORT_SYMBOL(ftrace_print_hex_seq);
 
 const char *
-ftrace_print_array_seq(struct trace_seq *p, const void *buf, int buf_len,
+ftrace_print_array_seq(struct trace_seq *p, const void *buf, int count,
                        size_t el_size)
 {
         const char *ret = trace_seq_buffer_ptr(p);
         const char *prefix = "";
         void *ptr = (void *)buf;
+        size_t buf_len = count * el_size;
 
         trace_seq_putc(p, '{');
 
diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index d60fe62ec4fa..6dd022c7b5bc 100644
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -443,7 +443,7 @@ static int create_trace_uprobe(int argc, char **argv)
         if (ret)
                 goto fail_address_parse;
 
-        inode = igrab(path.dentry->d_inode);
+        inode = igrab(d_inode(path.dentry));
         path_put(&path);
 
         if (!inode || !S_ISREG(inode->i_mode)) {