[PATCH 1/2] tracing: Properly match strings that start with numbers

From: Brian Norris

Date: Mon Nov 16 2026 - 21:28:44 EST


As an optimization, set_ftrace_filter supports writing indices (numbers)
instead of function names. This support was added to the generic glob
(fake regex) function, which breaks the ability to filter string
patterns that start with a number. For example, PCI device names tend to
look like '0001:01:00.0', and a reasonable filter might be:

echo 'name ~ "0001:*"' > /sys/kernel/tracing/events/rpm/rpm_resume/filter

Move the MATCH_INDEX code out to the only place it actually was intended
to work -- ftrace match_records(), with a 'func' and no 'mod'.

As a side effect, this also fixes :mod:<module> function filtering for
modules whose names start with a digit.

Fixes: f79b3f338564 ("ftrace: Allow enabling of filters via index of available_filter_functions")
Signed-off-by: Brian Norris <briannorris@xxxxxxxxxxxx>
---

kernel/trace/ftrace.c | 3 ++-
kernel/trace/trace.h | 1 -
kernel/trace/trace_events_filter.c | 5 -----
3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index c7d74b33d36d..6654da9d1bbf 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -5029,7 +5029,8 @@ match_records(struct ftrace_hash *hash, char *func, int len, char *mod)
if (unlikely(ftrace_disabled))
return 0;

- if (func_g.type == MATCH_INDEX)
+ if (func_g.type == MATCH_FULL && !mod &&
+ func_g.search && isdigit(func_g.search[0]))
return add_rec_by_index(hash, &func_g, clear_filter);

do_for_each_ftrace_rec(pg, rec) {
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index 0635503a31dd..3613476e5508 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -1807,7 +1807,6 @@ enum regex_type {
MATCH_MIDDLE_ONLY,
MATCH_END_ONLY,
MATCH_GLOB,
- MATCH_INDEX,
};

struct regex {
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index c10951bcfc5f..07ce75244233 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -1118,9 +1118,6 @@ enum regex_type filter_parse_regex(char *buff, int len, char **search, int *not)

*search = buff;

- if (isdigit(buff[0]))
- return MATCH_INDEX;
-
for (i = 0; i < len; i++) {
if (buff[i] == '*') {
if (!i) {
@@ -1158,8 +1155,6 @@ static void filter_build_regex(struct filter_pred *pred)
}

switch (type) {
- /* MATCH_INDEX should not happen, but if it does, match full */
- case MATCH_INDEX:
case MATCH_FULL:
r->match = regex_match_full;
break;
--
2.56.1.703.gf848ed807c-goog