4 files changed, 22 insertions, 12 deletions

diff --git a/kernel/trace/Kconfig b/kernel/trace/Kconfig
index 644606e899fa..57981d338d1f 100644
--- a/kernel/trace/Kconfig
+++ b/kernel/trace/Kconfig
@@ -317,7 +317,7 @@ config KMEMTRACE
           and profile kernel code.
 
           This requires an userspace application to use. See
-          Documentation/vm/kmemtrace.txt for more information.
+          Documentation/trace/kmemtrace.txt for more information.
 
           Saying Y will make the kernel somewhat larger and slower. However,
           if you disable kmemtrace at run-time or boot-time, the performance
@@ -422,7 +422,7 @@ config MMIOTRACE
           implementation and works via page faults. Tracing is disabled by
           default and can be enabled at run-time.
 
-          See Documentation/tracers/mmiotrace.txt.
+          See Documentation/trace/mmiotrace.txt.
           If you are not helping to develop drivers, say N.
 
 config MMIOTRACE_TEST
diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index be9299a53e2a..789e14eb09a5 100644
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -503,6 +503,7 @@ event_filter_write(struct file *filp, const char __user *ubuf, size_t cnt,
 
         if (copy_from_user(&buf, ubuf, cnt))
                 return -EFAULT;
+        buf[cnt] = '\0';
 
         pred = kzalloc(sizeof(*pred), GFP_KERNEL);
         if (!pred)
@@ -520,9 +521,10 @@ event_filter_write(struct file *filp, const char __user *ubuf, size_t cnt,
                 return cnt;
         }
 
-        if (filter_add_pred(call, pred)) {
+        err = filter_add_pred(call, pred);
+        if (err < 0) {
                 filter_free_pred(pred);
-                return -EINVAL;
+                return err;
         }
 
         *ppos += cnt;
@@ -569,6 +571,7 @@ subsystem_filter_write(struct file *filp, const char __user *ubuf, size_t cnt,
 
         if (copy_from_user(&buf, ubuf, cnt))
                 return -EFAULT;
+        buf[cnt] = '\0';
 
         pred = kzalloc(sizeof(*pred), GFP_KERNEL);
         if (!pred)
@@ -586,10 +589,11 @@ subsystem_filter_write(struct file *filp, const char __user *ubuf, size_t cnt,
                 return cnt;
         }
 
-        if (filter_add_subsystem_pred(system, pred)) {
+        err = filter_add_subsystem_pred(system, pred);
+        if (err < 0) {
                 filter_free_subsystem_preds(system);
                 filter_free_pred(pred);
-                return -EINVAL;
+                return err;
         }
 
         *ppos += cnt;
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index 470ad9487ecc..9f8ecca34a59 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -215,7 +215,7 @@ static int __filter_add_pred(struct ftrace_event_call *call,
                 }
         }
 
-        return -ENOMEM;
+        return -ENOSPC;
 }
 
 static int is_string_field(const char *type)
@@ -319,7 +319,7 @@ int filter_add_subsystem_pred(struct event_subsystem *system,
         }
 
         if (i == MAX_FILTER_PRED)
-                return -EINVAL;
+                return -ENOSPC;
 
         events_for_each(call) {
                 int err;
@@ -410,16 +410,22 @@ int filter_parse(char **pbuf, struct filter_pred *pred)
                 }
         }
 
+        if (!val_str) {
+                pred->field_name = NULL;
+                return -EINVAL;
+        }
+
         pred->field_name = kstrdup(pred->field_name, GFP_KERNEL);
         if (!pred->field_name)
                 return -ENOMEM;
 
-        pred->val = simple_strtoull(val_str, &tmp, 10);
+        pred->val = simple_strtoull(val_str, &tmp, 0);
         if (tmp == val_str) {
                 pred->str_val = kstrdup(val_str, GFP_KERNEL);
                 if (!pred->str_val)
                         return -ENOMEM;
-        }
+        } else if (*tmp != '\0')
+                return -EINVAL;
 
         return 0;
 }
diff --git a/kernel/trace/trace_events_stage_2.h b/kernel/trace/trace_events_stage_2.h
index 1c94b87c7180..02fb710193ed 100644
--- a/kernel/trace/trace_events_stage_2.h
+++ b/kernel/trace/trace_events_stage_2.h
@@ -105,10 +105,10 @@ ftrace_raw_output_##call(struct trace_iterator *iter, int flags)	\
                 return 0;
 
 #undef __entry
-#define __entry "REC"
+#define __entry REC
 
 #undef TP_printk
-#define TP_printk(fmt, args...) "%s, %s\n", #fmt, #args
+#define TP_printk(fmt, args...) "%s, %s\n", #fmt, __stringify(args)
 
 #undef TP_fast_assign
 #define TP_fast_assign(args...) args