From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756657AbZLND6X (ORCPT ); Sun, 13 Dec 2009 22:58:23 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1756637AbZLND6T (ORCPT ); Sun, 13 Dec 2009 22:58:19 -0500 Received: from cn.fujitsu.com ([222.73.24.84]:62346 "EHLO song.cn.fujitsu.com" rhost-flags-OK-FAIL-OK-OK) by vger.kernel.org with ESMTP id S1756632AbZLND6R (ORCPT ); Sun, 13 Dec 2009 22:58:17 -0500 Message-ID: <4B25B7C4.60108@cn.fujitsu.com> Date: Mon, 14 Dec 2009 11:57:56 +0800 From: Li Zefan User-Agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1b3pre) Gecko/20090513 Fedora/3.0-2.3.beta2.fc11 Thunderbird/3.0b2 MIME-Version: 1.0 To: Steven Rostedt , Ingo Molnar CC: Frederic Weisbecker , Wenji Huang , LKML Subject: [PATCH 3/7] tracing/filters: Fix MATCH_END_ONLY filter matching References: <4B25B797.1040201@cn.fujitsu.com> In-Reply-To: <4B25B797.1040201@cn.fujitsu.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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