[PATCH 5/7] tracing/filters: Fix MATCH_MIDDLE_ONLY filter matching

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 5/7] tracing/filters: Fix MATCH_MIDDLE_ONLY filter matching
Date: Mon, 14 Dec 2009 11:58:24 +0800	[thread overview]
Message-ID: <4B25B7E0.5000403@cn.fujitsu.com> (raw)
In-Reply-To: <4B25B797.1040201@cn.fujitsu.com>

The @str might not be NULL-terminated if it's of type
DYN_STRING or STATIC_STRING, so we should use strnstr()
instead of strstr().

Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
---
 kernel/trace/trace_events_filter.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index 49e44dd..f364b08 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -268,7 +268,7 @@ static int regex_match_front(char *str, struct regex *r, int len)
 
 static int regex_match_middle(char *str, struct regex *r, int len)
 {
-	if (strstr(str, r->pattern))
+	if (strnstr(str, r->pattern, len))
 		return 1;
 	return 0;
 }
-- 
1.6.3

