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 1/7] tracing/probe: Check maxactive error cases
Date: Thu, 14 Mar 2019 13:30:09 +0900 [thread overview]
Message-ID: <155253780952.14922.15784129810238750331.stgit@devnote2> (raw)
In-Reply-To: <155253778926.14922.14048967363017104338.stgit@devnote2>
Check maxactive on kprobe error case, because maxactive
is only for kretprobe, not for kprobe. Also, maxactive
should not be 0, it should be at least 1.
Signed-off-by: Masami Hiramatsu <mhiramat@kernel.org>
---
kernel/trace/trace_kprobe.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/kernel/trace/trace_kprobe.c b/kernel/trace/trace_kprobe.c
index d5fb09ebba8b..d47e12596f12 100644
--- a/kernel/trace/trace_kprobe.c
+++ b/kernel/trace/trace_kprobe.c
@@ -624,7 +624,11 @@ static int trace_kprobe_create(int argc, const char *argv[])
if (event)
event++;
- if (is_return && isdigit(argv[0][1])) {
+ if (isdigit(argv[0][1])) {
+ if (!is_return) {
+ pr_info("Maxactive is not for kprobe");
+ return -EINVAL;
+ }
if (event)
len = event - &argv[0][1] - 1;
else
@@ -634,8 +638,8 @@ static int trace_kprobe_create(int argc, const char *argv[])
memcpy(buf, &argv[0][1], len);
buf[len] = '\0';
ret = kstrtouint(buf, 0, &maxactive);
- if (ret) {
- pr_info("Failed to parse maxactive.\n");
+ if (ret || !maxactive) {
+ pr_info("Invalid maxactive number\n");
return ret;
}
/* kretprobes instances are iterated over via a list. The
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 ` Masami Hiramatsu [this message]
2019-03-14 4:30 ` [RFC PATCH v2 2/7] tracing/probe: Check event name length correctly Masami Hiramatsu
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=155253780952.14922.15784129810238750331.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.