diff options
| author | Masami Hiramatsu <mhiramat@kernel.org> | 2019-03-14 13:30:20 +0900 |
|---|---|---|
| committer | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2019-03-14 19:53:47 -0400 |
| commit | dec65d79fd269d05427c8167090bfc9c3d0b56c4 (patch) | |
| tree | c9ccc1d69f4565b2cd00a46af3dc1a67f83d6219 /kernel/trace | |
| parent | 287c038c0b994dae7569d96eca154f6a7ff6b4a9 (diff) | |
| download | linux-dec65d79fd269d05427c8167090bfc9c3d0b56c4.tar.gz linux-dec65d79fd269d05427c8167090bfc9c3d0b56c4.tar.bz2 linux-dec65d79fd269d05427c8167090bfc9c3d0b56c4.zip | |
tracing/probe: Check event name length correctly
Ensure given name of event is not too long when parsing it,
and fix to update event name offset correctly when the group
name is given. For example, this makes probe event to check
the "p:foo/" error case correctly.
Link: http://lkml.kernel.org/r/155253782046.14922.14724124823730168629.stgit@devnote2
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
Diffstat (limited to 'kernel/trace')
| -rw-r--r-- | kernel/trace/trace_probe.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index cfcf77e6fb19..0dc13bff2847 100644 --- a/kernel/trace/trace_probe.c +++ b/kernel/trace/trace_probe.c @@ -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) { @@ -173,10 +174,15 @@ int traceprobe_parse_event_name(const char **pevent, const char **pgroup, strlcpy(buf, event, slash - event + 1); *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; } return 0; } |