public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
	Andrew Morton <akpm@linux-foundation.org>,
	Linyu Yuan <quic_linyyuan@quicinc.com>,
	Lukas Bulwahn <lukas.bulwahn@gmail.com>
Subject: [for-linus][PATCH 02/10] tracing: React to error return from traceprobe_parse_event_name()
Date: Sat, 20 Aug 2022 20:07:39 -0400	[thread overview]
Message-ID: <20220821000844.684668694@goodmis.org> (raw)
In-Reply-To: 20220821000737.328590235@goodmis.org

From: Lukas Bulwahn <lukas.bulwahn@gmail.com>

The function traceprobe_parse_event_name() may set the first two function
arguments to a non-null value and still return -EINVAL to indicate an
unsuccessful completion of the function. Hence, it is not sufficient to
just check the result of the two function arguments for being not null,
but the return value also needs to be checked.

Commit 95c104c378dc ("tracing: Auto generate event name when creating a
group of events") changed the error-return-value checking of the second
traceprobe_parse_event_name() invocation in __trace_eprobe_create() and
removed checking the return value to jump to the error handling case.

Reinstate using the return value in the error-return-value checking.

Link: https://lkml.kernel.org/r/20220811071734.20700-1-lukas.bulwahn@gmail.com

Fixes: 95c104c378dc ("tracing: Auto generate event name when creating a group of events")
Acked-by: Linyu Yuan <quic_linyyuan@quicinc.com>
Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
---
 kernel/trace/trace_eprobe.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/trace/trace_eprobe.c b/kernel/trace/trace_eprobe.c
index 4a0e9d927443..550671985fd1 100644
--- a/kernel/trace/trace_eprobe.c
+++ b/kernel/trace/trace_eprobe.c
@@ -883,7 +883,7 @@ static int __trace_eprobe_create(int argc, const char *argv[])
 	trace_probe_log_set_index(1);
 	sys_event = argv[1];
 	ret = traceprobe_parse_event_name(&sys_event, &sys_name, buf2, 0);
-	if (!sys_event || !sys_name) {
+	if (ret || !sys_event || !sys_name) {
 		trace_probe_log_err(0, NO_EVENT_INFO);
 		goto parse_error;
 	}
-- 
2.35.1

  parent reply	other threads:[~2022-08-21  0:09 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-08-21  0:07 [for-linus][PATCH 00/10] tracing: Fixes for 6.0 Steven Rostedt
2022-08-21  0:07 ` [for-linus][PATCH 01/10] tracing: Suppress sparse warnings triggered by is_signed_type() Steven Rostedt
2022-08-21 18:35   ` Linus Torvalds
2022-08-21 19:55     ` Steven Rostedt
2022-08-22 18:20     ` Bart Van Assche
2022-08-22 18:45       ` Linus Torvalds
2022-08-22 20:19         ` Bart Van Assche
2022-08-23  7:06         ` Rasmus Villemoes
2022-08-23 22:05           ` Bart Van Assche
2022-08-23 23:18             ` Linus Torvalds
2022-08-23 23:57               ` Linus Torvalds
2022-08-24  2:09                 ` Al Viro
2022-08-24  2:16                   ` Linus Torvalds
2022-08-24  3:10                   ` Al Viro
2022-08-24  3:20                     ` Al Viro
2022-08-24  5:56                     ` Linus Torvalds
2022-08-24  0:09               ` Bart Van Assche
2022-08-24  1:49                 ` Linus Torvalds
2022-08-24  2:11                   ` Linus Torvalds
2022-08-24  3:47                     ` Bart Van Assche
2022-08-24  3:46                   ` Bart Van Assche
2022-08-24 23:28                   ` Bart Van Assche
2022-08-25  0:30                     ` Linus Torvalds
2022-08-25  0:40                       ` Linus Torvalds
2022-08-25  7:57                         ` Rasmus Villemoes
2022-08-25  8:07                           ` Linus Torvalds
2022-08-25 17:39                         ` Bart Van Assche
2022-08-25 18:17                           ` Kees Cook
2022-08-21  0:07 ` Steven Rostedt [this message]
2022-08-21  0:07 ` [for-linus][PATCH 03/10] tracing/perf: Fix double put of trace event when init fails Steven Rostedt
2022-08-21  0:07 ` [for-linus][PATCH 04/10] ftrace: Fix NULL pointer dereference in is_ftrace_trampoline when ftrace is dead Steven Rostedt
2022-08-21  0:07 ` [for-linus][PATCH 05/10] tracing/eprobes: Do not allow eprobes to use $stack, or % for regs Steven Rostedt
2022-08-21  0:07 ` [for-linus][PATCH 06/10] tracing/eprobes: Do not hardcode $comm as a string Steven Rostedt
2022-08-21  0:07 ` [for-linus][PATCH 07/10] tracing/eprobes: Fix reading of string fields Steven Rostedt
2022-08-21  0:07 ` [for-linus][PATCH 08/10] tracing/eprobes: Have event probes be consistent with kprobes and uprobes Steven Rostedt
2022-08-21  0:07 ` [for-linus][PATCH 09/10] tracing/probes: Have kprobes and uprobes use $COMM too Steven Rostedt
2022-08-21  0:07 ` [for-linus][PATCH 10/10] tracing: Have filter accept "common_cpu" to be consistent Steven Rostedt

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=20220821000844.684668694@goodmis.org \
    --to=rostedt@goodmis.org \
    --cc=akpm@linux-foundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lukas.bulwahn@gmail.com \
    --cc=mingo@kernel.org \
    --cc=quic_linyyuan@quicinc.com \
    /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