Commit 751e9983 authored by Li Zefan's avatar Li Zefan Committed by Steven Rostedt

ftrace: Fix MATCH_END_ONLY function filter

For '*foo' pattern, we should allow any string ending with
'foo', but ftrace filter incorrectly disallows strings
like bar_foo_foo:

  # echo '*io' > set_ftrace_filter
  # cat set_ftrace_filter | grep 'req_bio_endio'
  # cat available_filter_functions | grep 'req_bio_endio'
  req_bio_endio
Signed-off-by: default avatarLi Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <4B4E870E.6060607@cn.fujitsu.com>
Acked-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent b82a4045
...@@ -1690,7 +1690,7 @@ ftrace_regex_lseek(struct file *file, loff_t offset, int origin) ...@@ -1690,7 +1690,7 @@ ftrace_regex_lseek(struct file *file, loff_t offset, int origin)
static int ftrace_match(char *str, char *regex, int len, int type) static int ftrace_match(char *str, char *regex, int len, int type)
{ {
int matched = 0; int matched = 0;
char *ptr; int slen;
switch (type) { switch (type) {
case MATCH_FULL: case MATCH_FULL:
...@@ -1706,8 +1706,8 @@ static int ftrace_match(char *str, char *regex, int len, int type) ...@@ -1706,8 +1706,8 @@ static int ftrace_match(char *str, char *regex, int len, int type)
matched = 1; matched = 1;
break; break;
case MATCH_END_ONLY: case MATCH_END_ONLY:
ptr = strstr(str, regex); slen = strlen(str);
if (ptr && (ptr[len] == 0)) if (slen >= len && memcmp(str + slen - len, regex, len) == 0)
matched = 1; matched = 1;
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment