From: Tom Zanussi <zanussi@kernel.org>
To: rostedt@goodmis.org, axelrasmussen@google.com
Cc: mhiramat@kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v3 3/7] tracing: Check that the synthetic event and field names are legal
Date: Tue, 13 Oct 2020 09:17:54 -0500 [thread overview]
Message-ID: <c4d4bb59d3ac39bcbd70fba0cf837d6b1cedb015.1602598160.git.zanussi@kernel.org> (raw)
In-Reply-To: <cover.1602598160.git.zanussi@kernel.org>
In-Reply-To: <cover.1602598160.git.zanussi@kernel.org>
Call the is_good_name() function used by probe events to make sure
synthetic event and field names don't contain illegal characters and
cause unexpected parsing of synthetic event commands.
Fixes: 4b147936fa50 (tracing: Add support for 'synthetic' events)
Reported-by: Masami Hiramatsu <mhiramat@kernel.org>
Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>
Tested-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Tom Zanussi <zanussi@kernel.org>
---
kernel/trace/trace_events_synth.c | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/kernel/trace/trace_events_synth.c b/kernel/trace/trace_events_synth.c
index b19e2f4159ab..8c9d6e464da0 100644
--- a/kernel/trace/trace_events_synth.c
+++ b/kernel/trace/trace_events_synth.c
@@ -572,6 +572,10 @@ static struct synth_field *parse_synth_field(int argc, const char **argv,
ret = -ENOMEM;
goto free;
}
+ if (!is_good_name(field->name)) {
+ ret = -EINVAL;
+ goto free;
+ }
if (field_type[0] == ';')
field_type++;
@@ -1112,6 +1116,11 @@ static int __create_synth_event(int argc, const char *name, const char **argv)
mutex_lock(&event_mutex);
+ if (!is_good_name(name)) {
+ ret = -EINVAL;
+ goto out;
+ }
+
event = find_synth_event(name);
if (event) {
ret = -EEXIST;
--
2.17.1
next prev parent reply other threads:[~2020-10-13 14:18 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-13 14:17 [PATCH v3 0/7] tracing: Synthetic event dynamic string fixes Tom Zanussi
2020-10-13 14:17 ` [PATCH v3 1/7] tracing: Don't show dynamic string internals in synthetic event description Tom Zanussi
2020-10-13 14:17 ` [PATCH v3 2/7] tracing: Move is_good_name() from trace_probe.h to trace.h Tom Zanussi
2020-10-13 14:17 ` Tom Zanussi [this message]
2020-10-13 14:17 ` [PATCH v3 4/7] tracing: Add synthetic event error logging Tom Zanussi
2020-10-13 15:37 ` Steven Rostedt
2020-10-13 14:17 ` [PATCH v3 5/7] selftests/ftrace: Change synthetic event name for inter-event-combined test Tom Zanussi
2020-10-13 14:17 ` [PATCH v3 6/7] tracing: Handle synthetic event array field type checking correctly Tom Zanussi
2020-10-13 14:17 ` [PATCH v3 7/7] selftests/ftrace: Add test case for synthetic event syntax errors Tom Zanussi
2020-10-14 2:06 ` Masami Hiramatsu
2020-10-14 17:32 ` Steven Rostedt
2020-10-15 0:16 ` Masami Hiramatsu
2020-10-15 13:59 ` Tom Zanussi
2020-10-14 0:22 ` [PATCH v3 0/7] tracing: Synthetic event dynamic string fixes Masami Hiramatsu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c4d4bb59d3ac39bcbd70fba0cf837d6b1cedb015.1602598160.git.zanussi@kernel.org \
--to=zanussi@kernel.org \
--cc=axelrasmussen@google.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mhiramat@kernel.org \
--cc=rostedt@goodmis.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).