lkml.org 
[lkml]   [2010]   [Jan]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:tracing/urgent] tracing/filters: Fix MATCH_MIDDLE_ONLY filter matching
    Commit-ID:  b2af211f284eb1bef19fbb85fc8ef551bb1e7460
    Gitweb: http://git.kernel.org/tip/b2af211f284eb1bef19fbb85fc8ef551bb1e7460
    Author: Li Zefan <lizf@cn.fujitsu.com>
    AuthorDate: Thu, 14 Jan 2010 10:54:11 +0800
    Committer: Steven Rostedt <rostedt@goodmis.org>
    CommitDate: Thu, 14 Jan 2010 22:38:11 -0500

    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>
    ---
    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;
    }

    \
     
     \ /
      Last update: 2010-01-16 10:47    [W:0.024 / U:0.584 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site