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_END_ONLY filter matching
    Commit-ID:  a3291c14ecf0a995e30d993b7f2cae031de98727
    Gitweb: http://git.kernel.org/tip/a3291c14ecf0a995e30d993b7f2cae031de98727
    Author: Li Zefan <lizf@cn.fujitsu.com>
    AuthorDate: Thu, 14 Jan 2010 10:53:41 +0800
    Committer: Steven Rostedt <rostedt@goodmis.org>
    CommitDate: Thu, 14 Jan 2010 22:38:07 -0500

    tracing/filters: Fix MATCH_END_ONLY filter matching

    For '*foo' pattern, we should allow any string ending with
    'foo', but event filtering incorrectly disallows strings
    like bar_foo_foo:

    Signed-off-by: Li Zefan <lizf@cn.fujitsu.com>
    LKML-Reference: <4B4E8735.6070604@cn.fujitsu.com>
    Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
    Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
    ---
    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;
    }

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