Skip to content

Commit

Permalink
tracing: probeevent: Fix to make the type of $comm string
Browse files Browse the repository at this point in the history
Fix to make the type of $comm "string".  If we set the other type to $comm
argument, it shows meaningless value or wrong data. Currently probe events
allow us to set string array type (e.g. ":string[2]"), or other digit types
like x8 on $comm. But since clearly $comm is just a string data, it should
not be fetched by other types including array.

Link: http://lkml.kernel.org/r/155723736241.9149.14582064184468574539.stgit@devnote2

Cc: Andreas Ziegler <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: [email protected]
Fixes: 5330592 ("tracing: probeevent: Introduce new argument fetching code")
Signed-off-by: Masami Hiramatsu <[email protected]>
Signed-off-by: Steven Rostedt (VMware) <[email protected]>
  • Loading branch information
mhiramat authored and rostedt committed May 8, 2019
1 parent 489fe00 commit 3dd1f7f
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions kernel/trace/trace_probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -533,13 +533,14 @@ static int traceprobe_parse_probe_arg_body(char *arg, ssize_t *size,
}
}
}
/*
* The default type of $comm should be "string", and it can't be
* dereferenced.
*/
if (!t && strcmp(arg, "$comm") == 0)

/* Since $comm can not be dereferred, we can find $comm by strcmp */
if (strcmp(arg, "$comm") == 0) {
/* The type of $comm must be "string", and not an array. */
if (parg->count || (t && strcmp(t, "string")))
return -EINVAL;
parg->type = find_fetch_type("string");
else
} else
parg->type = find_fetch_type(t);
if (!parg->type) {
trace_probe_log_err(offset + (t ? (t - arg) : 0), BAD_TYPE);
Expand Down

0 comments on commit 3dd1f7f

Please sign in to comment.