From: Li Zefan <lizf@cn.fujitsu.com>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: Ingo Molnar <mingo@elte.hu>,
Frederic Weisbecker <fweisbec@gmail.com>,
Wenji Huang <wenji.huang@oracle.com>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 1/4] ftrace: Fix MATCH_END_ONLY filter matching
Date: Fri, 11 Dec 2009 17:58:40 +0800 [thread overview]
Message-ID: <4B2217D0.5000308@cn.fujitsu.com> (raw)
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>
---
kernel/trace/ftrace.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/kernel/trace/ftrace.c b/kernel/trace/ftrace.c
index e51a1bc..613dfb1 100644
--- a/kernel/trace/ftrace.c
+++ b/kernel/trace/ftrace.c
@@ -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)
{
int matched = 0;
- char *ptr;
+ int slen;
switch (type) {
case MATCH_FULL:
@@ -1706,8 +1706,8 @@ static int ftrace_match(char *str, char *regex, int len, int type)
matched = 1;
break;
case MATCH_END_ONLY:
- ptr = strstr(str, regex);
- if (ptr && (ptr[len] == 0))
+ slen = strlen(str);
+ if (slen >= len && memcpy(str + slen - len, regex, len))
matched = 1;
break;
}
--
1.6.3
next reply other threads:[~2009-12-11 9:58 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-11 9:58 Li Zefan [this message]
2009-12-11 9:59 ` [PATCH 2/4] tracing/filters: Fix MATCH_FULL filter matching for PTR_STRING Li Zefan
2009-12-11 12:07 ` Frederic Weisbecker
2009-12-14 1:40 ` Li Zefan
2009-12-14 12:21 ` Frederic Weisbecker
2009-12-14 12:23 ` Frederic Weisbecker
2009-12-11 9:59 ` [PATCH 3/4] tracing/filters: Fix MATCH_FRONT_ONLY filter matching Li Zefan
2009-12-11 12:02 ` Frederic Weisbecker
2009-12-14 1:43 ` Li Zefan
2009-12-14 12:22 ` Frederic Weisbecker
2009-12-11 9:59 ` [PATCH 4/4] tracing/filters: Fix MATCH_EBD_ONLY " Li Zefan
2009-12-11 15:14 ` Steven Rostedt
2009-12-14 1:08 ` Li Zefan
2009-12-11 12:10 ` [PATCH 1/4] ftrace: Fix MATCH_END_ONLY " Frederic Weisbecker
2009-12-11 12:20 ` Frederic Riss
2009-12-11 12:27 ` Frederic Weisbecker
2009-12-11 15:10 ` Steven Rostedt
2009-12-11 17:46 ` Frederic Weisbecker
2009-12-14 1:04 ` Li Zefan
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4B2217D0.5000308@cn.fujitsu.com \
--to=lizf@cn.fujitsu.com \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=rostedt@goodmis.org \
--cc=wenji.huang@oracle.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox