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 4/4] tracing/filters: Fix MATCH_EBD_ONLY filter matching
Date: Fri, 11 Dec 2009 17:59:42 +0800 [thread overview]
Message-ID: <4B22180E.6090907@cn.fujitsu.com> (raw)
In-Reply-To: <4B2217D0.5000308@cn.fujitsu.com>
For '*foo' pattern, we should allow any string ending with
'foo', but tracing filter incorrectly disallows strings
matching regex expression ".*foo.*foo".
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
kernel/trace/trace_events_filter.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index bd492ce..9f96339 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -276,9 +276,10 @@ static int regex_match_middle(char *str, struct regex *r, int len)
static int regex_match_end(char *str, struct regex *r, int len)
{
- char *ptr = strstr(str, r->pattern);
+ int strlen = len - 1;
- if (ptr && (ptr[r->len] == 0))
+ if (strlen >= r->len &&
+ !memcmp(str + strlen - r->len, r->pattern, r->len))
return 1;
return 0;
}
--
1.6.3
next prev parent reply other threads:[~2009-12-11 10:00 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-12-11 9:58 [PATCH 1/4] ftrace: Fix MATCH_END_ONLY filter matching Li Zefan
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 ` Li Zefan [this message]
2009-12-11 15:14 ` [PATCH 4/4] tracing/filters: Fix MATCH_EBD_ONLY " 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=4B22180E.6090907@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.