Skip to content

Commit

Permalink
tracing/probe: Check event/group naming rule at parsing
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
mhiramat authored and rostedt committed Mar 14, 2019
1 parent b4443c1 commit 5b7a962
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
7 changes: 1 addition & 6 deletions kernel/trace/trace_kprobe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
Expand Down
8 changes: 8 additions & 0 deletions kernel/trace/trace_probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
}

Expand Down
5 changes: 1 addition & 4 deletions kernel/trace/trace_uprobe.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 5b7a962

Please sign in to comment.