All of lore.kernel.org
 help / color / mirror / Atom feed
From: Li Zefan <lizf@cn.fujitsu.com>
To: Steven Rostedt <rostedt@goodmis.org>, Ingo Molnar <mingo@elte.hu>
Cc: Frederic Weisbecker <fweisbec@gmail.com>,
	Wenji Huang <wenji.huang@oracle.com>,
	LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 3/7] tracing/filters: Fix MATCH_END_ONLY filter matching
Date: Mon, 14 Dec 2009 11:57:56 +0800	[thread overview]
Message-ID: <4B25B7C4.60108@cn.fujitsu.com> (raw)
In-Reply-To: <4B25B797.1040201@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 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.3


  parent reply	other threads:[~2009-12-14  3:58 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-12-14  3:57 [PATCH 0/7] tracing: Fix bugs in string filters Li Zefan
2009-12-14  3:57 ` [PATCH 1/7] ftrace: Fix MATCH_END_ONLY function filter Li Zefan
2009-12-14  3:57 ` [PATCH 2/7] tracing/filters: Fix MATCH_FRONT_ONLY filter matching Li Zefan
2009-12-14  3:57 ` Li Zefan [this message]
2009-12-14  3:58 ` [PATCH 4/7] lib: Introduce strnstr() Li Zefan
2009-12-14  3:58 ` [PATCH 5/7] tracing/filters: Fix MATCH_MIDDLE_ONLY filter matching Li Zefan
2009-12-14  3:58 ` [PATCH 6/7] tracing/filters: Fix MATCH_END_ONLY filter matching for PTR_STRING Li Zefan
2009-12-14  3:59 ` [PATCH 7/7] tracing/filters: Add comment for match callbacks Li Zefan
2009-12-14 12:39 ` [PATCH 0/7] tracing: Fix bugs in string filters Frederic Weisbecker
2009-12-21  1:28   ` Li Zefan
  -- strict thread matches above, loose matches on Subject: below --
2010-01-14  2:52 [PATCH 0/7][RESEND] " Li Zefan
2010-01-14  2:53 ` [PATCH 3/7] tracing/filters: Fix MATCH_END_ONLY filter matching 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=4B25B7C4.60108@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.