From: Masami Hiramatsu <mhiramat@kernel.org> To: Tom Zanussi <zanussi@kernel.org>, Steven Rostedt <rostedt@goodmis.org> Cc: tglx@linutronix.de, mhiramat@kernel.org, namhyung@kernel.org, bigeasy@linutronix.de, joel@joelfernandes.org, linux-kernel@vger.kernel.org, linux-rt-users@vger.kernel.org Subject: [RFC PATCH v2 2/7] tracing/probe: Check event name length correctly Date: Thu, 14 Mar 2019 13:30:20 +0900 [thread overview] Message-ID: <155253782046.14922.14724124823730168629.stgit@devnote2> (raw) In-Reply-To: <155253778926.14922.14048967363017104338.stgit@devnote2> 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. Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org> --- kernel/trace/trace_probe.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c index 89da34b326e3..4cd50913cb5d 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; }
next prev parent reply other threads:[~2019-03-14 4:30 UTC|newest] Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-03-14 4:29 [RFC PATCH v2 0/7] tracing: Use common error_log with probe events Masami Hiramatsu 2019-03-14 4:30 ` [RFC PATCH v2 1/7] tracing/probe: Check maxactive error cases Masami Hiramatsu 2019-03-14 4:30 ` Masami Hiramatsu [this message] 2019-03-14 4:30 ` [RFC PATCH v2 3/7] tracing/probe: Check the size of argument name and body Masami Hiramatsu 2019-03-14 4:30 ` [RFC PATCH v2 4/7] tracing/probe: Check event/group naming rule at parsing Masami Hiramatsu 2019-03-14 4:30 ` [RFC PATCH v2 5/7] tracing/probe: Verify alloc_trace_*probe() result Masami Hiramatsu 2019-03-14 4:31 ` [RFC PATCH v2 6/7] tracing: Use tracing error_log with probe events Masami Hiramatsu 2019-03-14 4:31 ` [RFC PATCH v2 7/7] selftests/ftrace: Add error_log testcase for probe errors 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=155253782046.14922.14724124823730168629.stgit@devnote2 \ --to=mhiramat@kernel.org \ --cc=bigeasy@linutronix.de \ --cc=joel@joelfernandes.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-rt-users@vger.kernel.org \ --cc=namhyung@kernel.org \ --cc=rostedt@goodmis.org \ --cc=tglx@linutronix.de \ --cc=zanussi@kernel.org \ --subject='Re: [RFC PATCH v2 2/7] tracing/probe: Check event name length correctly' \ /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
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.