Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

tracing/probes: Have kprobes and uprobes use $COMM too

Both $comm and $COMM can be used to get current->comm in eprobes and the
filtering and histogram logic. Make kprobes and uprobes consistent in this
regard and allow both $comm and $COMM as well. Currently kprobes and
uprobes only handle $comm, which is inconsistent with the other utilities,
and can be confusing to users.

Link: https://lkml.kernel.org/r/20220820134401.317014913@goodmis.org
Link: https://lore.kernel.org/all/20220820220442.776e1ddaf8836e82edb34d01@kernel.org/

Cc: stable@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Tzvetomir Stoyanov <tz.stoyanov@gmail.com>
Cc: Tom Zanussi <zanussi@kernel.org>
Fixes: 533059281ee5 ("tracing: probeevent: Introduce new argument fetching code")
Suggested-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>

+3 -2
+3 -2
kernel/trace/trace_probe.c
··· 314 314 } 315 315 } else 316 316 goto inval_var; 317 - } else if (strcmp(arg, "comm") == 0) { 317 + } else if (strcmp(arg, "comm") == 0 || strcmp(arg, "COMM") == 0) { 318 318 code->op = FETCH_OP_COMM; 319 319 #ifdef CONFIG_HAVE_FUNCTION_ARG_ACCESS_API 320 320 } else if (((flags & TPARG_FL_MASK) == ··· 625 625 * we can find those by strcmp. But ignore for eprobes. 626 626 */ 627 627 if (!(flags & TPARG_FL_TPOINT) && 628 - (strcmp(arg, "$comm") == 0 || strncmp(arg, "\\\"", 2) == 0)) { 628 + (strcmp(arg, "$comm") == 0 || strcmp(arg, "$COMM") == 0 || 629 + strncmp(arg, "\\\"", 2) == 0)) { 629 630 /* The type of $comm must be "string", and not an array. */ 630 631 if (parg->count || (t && strcmp(t, "string"))) 631 632 goto out;