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

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

diff --git a/[refs] b/[refs]
index ef90e0065f51..e59d0b086fb0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b82a4045f7962483a78a874343dc6e31b79c96c1
+refs/heads/master: 751e9983ee276cb150e8812b1d995f6035a63878
diff --git a/trunk/kernel/trace/ftrace.c b/trunk/kernel/trace/ftrace.c
index 7968762c8167..1e6640f80454 100644
--- a/trunk/kernel/trace/ftrace.c
+++ b/trunk/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;
 	}