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 3/7] tracing/probe: Check the size of argument name and body
Date: Thu, 14 Mar 2019 13:30:30 +0900 [thread overview]
Message-ID: <155253783029.14922.12650939303827581096.stgit@devnote2> (raw)
In-Reply-To: <155253778926.14922.14048967363017104338.stgit@devnote2>
Check the size of argument name and expression is not 0
and smaller than maximum length.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
kernel/trace/trace_probe.c | 2 ++
kernel/trace/trace_probe.h | 1 +
2 files changed, 3 insertions(+)
diff --git a/kernel/trace/trace_probe.c b/kernel/trace/trace_probe.c
index 4cd50913cb5d..feae03056f0b 100644
--- a/kernel/trace/trace_probe.c
+++ b/kernel/trace/trace_probe.c
@@ -554,6 +554,8 @@ int traceprobe_parse_probe_arg(struct trace_probe *tp, int i, char *arg,
body = strchr(arg, '=');
if (body) {
+ if (body - arg > MAX_ARG_NAME_LEN || body == arg)
+ return -EINVAL;
parg->name = kmemdup_nul(arg, body - arg, GFP_KERNEL);
body++;
} else {
diff --git a/kernel/trace/trace_probe.h b/kernel/trace/trace_probe.h
index 8a63f8bc01bc..2177c206de15 100644
--- a/kernel/trace/trace_probe.h
+++ b/kernel/trace/trace_probe.h
@@ -32,6 +32,7 @@
#define MAX_TRACE_ARGS 128
#define MAX_ARGSTR_LEN 63
#define MAX_ARRAY_LEN 64
+#define MAX_ARG_NAME_LEN 32
#define MAX_STRING_SIZE PATH_MAX
/* Reserved field names */
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 ` [RFC PATCH v2 2/7] tracing/probe: Check event name length correctly Masami Hiramatsu
2019-03-14 4:30 ` Masami Hiramatsu [this message]
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=155253783029.14922.12650939303827581096.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 \
/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 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.