1 files changed, 18 insertions, 2 deletions

diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index 89da34b326e3..8f8411e7835f 100644
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -13,7 +13,7 @@
 
 #include "trace_probe.h"
 
-const char *reserved_field_names[] = {
+static const char *reserved_field_names[] = {
         "common_type",
         "common_flags",
         "common_preempt_count",
@@ -159,6 +159,7 @@ int traceprobe_parse_event_name(const char **pevent, const char **pgroup,
                                 char *buf)
 {
         const char *slash, *event = *pevent;
+        int len;
 
         slash = strchr(event, '/');
         if (slash) {
@@ -171,12 +172,25 @@ int traceprobe_parse_event_name(const char **pevent, const char **pgroup,
                         return -E2BIG;
                 }
                 strlcpy(buf, event, slash - event + 1);
+                if (!is_good_name(buf)) {
+                        pr_info("Group name must follow the same rules as C identifiers\n");
+                        return -EINVAL;
+                }
                 *pgroup = buf;
                 *pevent = slash + 1;
+                event = *pevent;
         }
-        if (strlen(event) == 0) {
+        len = strlen(event);
+        if (len == 0) {
                 pr_info("Event name is not specified\n");
                 return -EINVAL;
+        } else if (len > MAX_EVENT_NAME_LEN) {
+                pr_info("Event name is too long\n");
+                return -E2BIG;
+        }
+        if (!is_good_name(event)) {
+                pr_info("Event name must follow the same rules as C identifiers\n");
+                return -EINVAL;
         }
         return 0;
 }
@@ -548,6 +562,8 @@ int traceprobe_parse_probe_arg(struct trace_probe *tp, int i, char *arg,
 
         body = strchr(arg, '=');
         if (body) {
+                if (body - arg > MAX_ARG_NAME_LEN || body == arg)
+                        return -EINVAL;
                 parg->name = kmemdup_nul(arg, body - arg, GFP_KERNEL);
                 body++;
         } else {