From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@elte.hu>,
Andrew Morton <akpm@linux-foundation.org>,
Li Zefan <lizf@cn.fujitsu.com>,
Frederic Weisbecker <fweisbec@gmail.com>
Subject: [PATCH 4/8] tracing/filters: Fix MATCH_END_ONLY filter matching
Date: Thu, 14 Jan 2010 22:57:30 -0500 [thread overview]
Message-ID: <20100115035852.995805157@goodmis.org> (raw)
In-Reply-To: 20100115035726.462940848@goodmis.org
[-- Attachment #1: 0004-tracing-filters-Fix-MATCH_END_ONLY-filter-matching.patch --]
[-- Type: text/plain, Size: 1057 bytes --]
From: Li Zefan <lizf@cn.fujitsu.com>
For '*foo' pattern, we should allow any string ending with
'foo', but event filtering incorrectly disallows strings
like bar_foo_foo:
Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
LKML-Reference: <4B4E8735.6070604@cn.fujitsu.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
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 11c3973..49e44dd 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -275,9 +275,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) == 0)
return 1;
return 0;
}
--
1.6.5
next prev parent reply other threads:[~2010-01-15 3:58 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-15 3:57 [PATCH 0/8][GIT PULL][v2.6.33] tracing: fixes Steven Rostedt
2010-01-15 3:57 ` [PATCH 1/8] tracing/x86: Derive arch from bits argument in recordmcount.pl Steven Rostedt
2010-01-15 3:57 ` [PATCH 2/8] ftrace: Fix MATCH_END_ONLY function filter Steven Rostedt
2010-01-15 3:57 ` [PATCH 3/8] tracing/filters: Fix MATCH_FRONT_ONLY filter matching Steven Rostedt
2010-01-15 3:57 ` Steven Rostedt [this message]
2010-01-15 3:57 ` [PATCH 5/8] lib: Introduce strnstr() Steven Rostedt
2010-01-15 3:57 ` [PATCH 6/8] tracing/filters: Fix MATCH_MIDDLE_ONLY filter matching Steven Rostedt
2010-01-15 3:57 ` [PATCH 7/8] tracing/filters: Fix MATCH_FULL filter matching for PTR_STRING Steven Rostedt
2010-01-15 3:57 ` [PATCH 8/8] tracing/filters: Add comment for match callbacks Steven Rostedt
2010-01-16 6:56 ` [PATCH 0/8][GIT PULL][v2.6.33] tracing: fixes Ingo Molnar
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=20100115035852.995805157@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=fweisbec@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lizf@cn.fujitsu.com \
--cc=mingo@elte.hu \
/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