public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Li Zefan <lizf@cn.fujitsu.com>
To: Ingo Molnar <mingo@elte.hu>
Cc: Steven Rostedt <rostedt@goodmis.org>,
	Frederic Weisbecker <fweisbec@gmail.com>,
	LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH 5/7] tracing/filters: Fix MATCH_MIDDLE_ONLY filter matching
Date: Thu, 14 Jan 2010 10:54:11 +0800	[thread overview]
Message-ID: <4B4E8753.2000102@cn.fujitsu.com> (raw)
In-Reply-To: <4B4E86FB.40208@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>
Acked-by: Frederic Weisbecker <fweisbec@gmail.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 c6a0f8d..c43ebb3 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


  parent reply	other threads:[~2010-01-14  2:54 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-14  2:52 [PATCH 0/7][RESEND] tracing: Fix bugs in string filters Li Zefan
2010-01-14  2:53 ` [PATCH 1/7] ftrace: Fix MATCH_END_ONLY function filter Li Zefan
2010-01-16  9:42   ` [tip:tracing/urgent] " tip-bot for Li Zefan
2010-01-14  2:53 ` [PATCH 2/7] tracing/filters: Fix MATCH_FRONT_ONLY filter matching Li Zefan
2010-01-16  9:43   ` [tip:tracing/urgent] " tip-bot for Li Zefan
2010-01-14  2:53 ` [PATCH 3/7] tracing/filters: Fix MATCH_END_ONLY " Li Zefan
2010-01-16  9:43   ` [tip:tracing/urgent] " tip-bot for Li Zefan
2010-01-14  2:53 ` [PATCH 4/7] lib: Introduce strnstr() Li Zefan
2010-01-16  9:43   ` [tip:tracing/urgent] " tip-bot for Li Zefan
2010-01-16 11:12   ` [PATCH 4/7] " Alex Riesen
2010-01-18 14:53     ` Steven Rostedt
2010-01-18 15:56       ` Alex Riesen
2010-01-14  2:54 ` Li Zefan [this message]
2010-01-16  9:43   ` [tip:tracing/urgent] tracing/filters: Fix MATCH_MIDDLE_ONLY filter matching tip-bot for Li Zefan
2010-01-14  2:54 ` [PATCH 6/7] tracing/filters: Fix MATCH_END_ONLY filter matching for PTR_STRING Li Zefan
2010-01-16  9:44   ` [tip:tracing/urgent] tracing/filters: Fix MATCH_FULL " tip-bot for Li Zefan
2010-01-14  2:54 ` [PATCH 7/7] tracing/filters: Add comment for match callbacks Li Zefan
2010-01-16  9:44   ` [tip:tracing/urgent] " tip-bot for Li Zefan
  -- strict thread matches above, loose matches on Subject: below --
2009-12-14  3:57 [PATCH 0/7] tracing: Fix bugs in string filters Li Zefan
2009-12-14  3:58 ` [PATCH 5/7] tracing/filters: Fix MATCH_MIDDLE_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=4B4E8753.2000102@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 \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox