Skip to content

Commit

Permalink
tracing: Do not let synth_events block other dyn_event systems during…
Browse files Browse the repository at this point in the history
… create

synth_events is returning -EINVAL if the dyn_event create command does
not contain ' \t'. This prevents other systems from getting called back.
synth_events needs to return -ECANCELED in these cases when the command
is not targeting the synth_event system.

Link: https://lore.kernel.org/linux-trace-devel/20210930223821.11025-1-beaub@linux.microsoft.com

Fixes: c9e759b ("tracing: Rework synthetic event command parsing")
Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org>
Signed-off-by: Beau Belgrave <beaub@linux.microsoft.com>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
  • Loading branch information
Beau Belgrave authored and Steven Rostedt (VMware) committed Dec 11, 2021
1 parent e161c6b commit 4f67cca
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions kernel/trace/trace_events_synth.c
Original file line number Diff line number Diff line change
Expand Up @@ -2053,6 +2053,13 @@ static int create_synth_event(const char *raw_command)

last_cmd_set(raw_command);

name = raw_command;

/* Don't try to process if not our system */
if (name[0] != 's' || name[1] != ':')
return -ECANCELED;
name += 2;

p = strpbrk(raw_command, " \t");
if (!p) {
synth_err(SYNTH_ERR_INVALID_CMD, 0);
Expand All @@ -2061,12 +2068,6 @@ static int create_synth_event(const char *raw_command)

fields = skip_spaces(p);

name = raw_command;

if (name[0] != 's' || name[1] != ':')
return -ECANCELED;
name += 2;

/* This interface accepts group name prefix */
if (strchr(name, '/')) {
len = str_has_prefix(name, SYNTH_SYSTEM "/");
Expand Down

0 comments on commit 4f67cca

Please sign in to comment.