redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

ftrace: Fix MATCH_END_ONLY function filter

Browse source 
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: Li Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <4B4E870E.6060607@cn.fujitsu.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
This commit is contained in:
Li Zefan 2010-01-14 10:53:02 +08:00 committed by Steven Rostedt
parent b82a4045f7
commit 751e9983ee
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
kernel/trace/ftrace.c
View file

@ -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)
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;
} }