From 02a42de8d1b57177bd0ad992d65a6380ed358fd4 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Thu, 14 Jan 2010 10:53:41 +0800
Subject: [PATCH] --- yaml --- r: 179371 b: refs/heads/master c:
 a3291c14ecf0a995e30d993b7f2cae031de98727 h: refs/heads/master i:   179369:
 013b625891ef85e63b1331f9daac4f611d705949   179367:
 0efa69452cc013f735b788157bf2fb0a1e707a93 v: v3

---
 [refs]                                   | 2 +-
 trunk/kernel/trace/trace_events_filter.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 4f4402a90b73..bec3eace9b96 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 285caad415f459f336247932b4db95a571357a02
+refs/heads/master: a3291c14ecf0a995e30d993b7f2cae031de98727
diff --git a/trunk/kernel/trace/trace_events_filter.c b/trunk/kernel/trace/trace_events_filter.c
index 11c3973e6552..49e44dd17851 100644
--- a/trunk/kernel/trace/trace_events_filter.c
+++ b/trunk/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;
 }