1 files changed, 7 insertions, 6 deletions

diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index 4cc2d467d34c..e0d1d5353464 100644
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -533,13 +533,14 @@ static int traceprobe_parse_probe_arg_body(char *arg, ssize_t *size,
                         }
                 }
         }
-        /*
-         * The default type of $comm should be "string", and it can't be
-         * dereferenced.
-         */
-        if (!t && strcmp(arg, "$comm") == 0)
+
+        /* Since $comm can not be dereferred, we can find $comm by strcmp */
+        if (strcmp(arg, "$comm") == 0) {
+                /* The type of $comm must be "string", and not an array. */
+                if (parg->count || (t && strcmp(t, "string")))
+                        return -EINVAL;
                 parg->type = find_fetch_type("string");
-        else
+        } else
                 parg->type = find_fetch_type(t);
         if (!parg->type) {
                 trace_probe_log_err(offset + (t ? (t - arg) : 0), BAD_TYPE);