diff options
| author | Li Zefan <lizf@cn.fujitsu.com> | 2010-01-14 10:54:11 +0800 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2010-01-14 22:38:11 -0500 |
| commit | b2af211f284eb1bef19fbb85fc8ef551bb1e7460 (patch) | |
| tree | 251b3848de7478ad9123c92fc7c95a464bd84f78 | |
| parent | d5f1fb53353edc38da326445267c1df0c9676df2 (diff) | |
| download | linux-b2af211f284eb1bef19fbb85fc8ef551bb1e7460.tar.gz linux-b2af211f284eb1bef19fbb85fc8ef551bb1e7460.tar.bz2 linux-b2af211f284eb1bef19fbb85fc8ef551bb1e7460.zip | |
tracing/filters: Fix MATCH_MIDDLE_ONLY filter matching
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>
LKML-Reference: <4B4E8753.2000102@cn.fujitsu.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
| -rw-r--r-- | 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 49e44dd17851..f364b085397e 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; } |