tracing/probe: Check event/group naming rule at parsing

Check event and group naming rule at parsing it instead
of allocating probes.

Link: http://lkml.kernel.org/r/155253784064.14922.2336893061156236237.stgit@devnote2
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>

diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index a14837545295e292d9d30783736d7dc9273667a3..5265117ad7e8599e1bf9ff3ba3212b815012f939 100644 (file)
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -221,7 +221,7 @@ static struct trace_kprobe *alloc_trace_kprobe(const char *group,
 
        tk->rp.maxactive = maxactive;
 
-       if (!event || !is_good_name(event)) {
+       if (!event || !group) {
                ret = -EINVAL;
                goto error;
        }
@@ -231,11 +231,6 @@ static struct trace_kprobe *alloc_trace_kprobe(const char *group,
        if (!tk->tp.call.name)
                goto error;
 
-       if (!group || !is_good_name(group)) {
-               ret = -EINVAL;
-               goto error;
-       }
-
        tk->tp.class.system = kstrdup(group, GFP_KERNEL);
        if (!tk->tp.class.system)
                goto error;

diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index bf9d3d7e0c9d30f67cffbc51b684a043f60a71b2..8f8411e7835fdc0e138924c8ab5c35683894774e 100644 (file)
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -172,6 +172,10 @@ 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;
@@ -184,6 +188,10 @@ int traceprobe_parse_event_name(const char **pevent, const char **pgroup,
                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;
 }
 

diff --git a/kernel/trace/trace_uprobe.c b/kernel/trace/trace_uprobe.c
index e335576b941181614abd9eb8c15b0b710c3c0972..52f033489377e9a96ef2c215bd4a91612c197db4 100644 (file)
--- a/kernel/trace/trace_uprobe.c
+++ b/kernel/trace/trace_uprobe.c
@@ -266,10 +266,7 @@ alloc_trace_uprobe(const char *group, const char *event, int nargs, bool is_ret)
 {
        struct trace_uprobe *tu;
 
-       if (!event || !is_good_name(event))
-               return ERR_PTR(-EINVAL);
-
-       if (!group || !is_good_name(group))
+       if (!event || !group)
                return ERR_PTR(-EINVAL);
 
        tu = kzalloc(SIZEOF_TRACE_UPROBE(nargs), GFP_KERNEL);