From: tip-bot for Li Zefan <lizf@cn.fujitsu.com>
To: linux-tip-commits@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com,
fweisbec@gmail.com, rostedt@goodmis.org, lizf@cn.fujitsu.com,
tglx@linutronix.de
Subject: [tip:tracing/urgent] ftrace: Fix MATCH_END_ONLY function filter
Date: Sat, 16 Jan 2010 09:42:54 GMT [thread overview]
Message-ID: <tip-751e9983ee276cb150e8812b1d995f6035a63878@git.kernel.org> (raw)
In-Reply-To: <4B4E870E.6060607@cn.fujitsu.com>
Commit-ID: 751e9983ee276cb150e8812b1d995f6035a63878
Gitweb: http://git.kernel.org/tip/751e9983ee276cb150e8812b1d995f6035a63878
Author: Li Zefan <lizf@cn.fujitsu.com>
AuthorDate: Thu, 14 Jan 2010 10:53:02 +0800
Committer: Steven Rostedt <rostedt@goodmis.org>
CommitDate: Thu, 14 Jan 2010 22:38:03 -0500
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: 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>
---
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 7968762..1e6640f 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 && memcmp(str + slen - len, regex, len) == 0)
matched = 1;
break;
}
next prev parent reply other threads:[~2010-01-16 9:43 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-14 2:52 [PATCH 0/7][RESEND] tracing: Fix bugs in string filters Li Zefan
2010-01-14 2:53 ` [PATCH 1/7] ftrace: Fix MATCH_END_ONLY function filter Li Zefan
2010-01-16 9:42 ` tip-bot for Li Zefan [this message]
2010-01-14 2:53 ` [PATCH 2/7] tracing/filters: Fix MATCH_FRONT_ONLY filter matching Li Zefan
2010-01-16 9:43 ` [tip:tracing/urgent] " tip-bot for Li Zefan
2010-01-14 2:53 ` [PATCH 3/7] tracing/filters: Fix MATCH_END_ONLY " Li Zefan
2010-01-16 9:43 ` [tip:tracing/urgent] " tip-bot for Li Zefan
2010-01-14 2:53 ` [PATCH 4/7] lib: Introduce strnstr() Li Zefan
2010-01-16 9:43 ` [tip:tracing/urgent] " tip-bot for Li Zefan
2010-01-16 11:12 ` [PATCH 4/7] " Alex Riesen
2010-01-18 14:53 ` Steven Rostedt
2010-01-18 15:56 ` Alex Riesen
2010-01-14 2:54 ` [PATCH 5/7] tracing/filters: Fix MATCH_MIDDLE_ONLY filter matching Li Zefan
2010-01-16 9:43 ` [tip:tracing/urgent] " tip-bot for Li Zefan
2010-01-14 2:54 ` [PATCH 6/7] tracing/filters: Fix MATCH_END_ONLY filter matching for PTR_STRING Li Zefan
2010-01-16 9:44 ` [tip:tracing/urgent] tracing/filters: Fix MATCH_FULL " tip-bot for Li Zefan
2010-01-14 2:54 ` [PATCH 7/7] tracing/filters: Add comment for match callbacks Li Zefan
2010-01-16 9:44 ` [tip:tracing/urgent] " tip-bot for 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=tip-751e9983ee276cb150e8812b1d995f6035a63878@git.kernel.org \
--to=lizf@cn.fujitsu.com \
--cc=fweisbec@gmail.com \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).