lkml.org 
[lkml]   [2021]   [Nov]   [29]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.15 049/179] tracing: Fix pid filtering when triggers are attached
    Date
    From: Steven Rostedt (VMware) <rostedt@goodmis.org>

    commit a55f224ff5f238013de8762c4287117e47b86e22 upstream.

    If a event is filtered by pid and a trigger that requires processing of
    the event to happen is a attached to the event, the discard portion does
    not take the pid filtering into account, and the event will then be
    recorded when it should not have been.

    Cc: stable@vger.kernel.org
    Fixes: 3fdaf80f4a836 ("tracing: Implement event pid filtering")
    Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    kernel/trace/trace.h | 24 ++++++++++++++++++------
    1 file changed, 18 insertions(+), 6 deletions(-)

    --- a/kernel/trace/trace.h
    +++ b/kernel/trace/trace.h
    @@ -1360,14 +1360,26 @@ __event_trigger_test_discard(struct trac
    if (eflags & EVENT_FILE_FL_TRIGGER_COND)
    *tt = event_triggers_call(file, buffer, entry, event);

    - if (test_bit(EVENT_FILE_FL_SOFT_DISABLED_BIT, &file->flags) ||
    - (unlikely(file->flags & EVENT_FILE_FL_FILTERED) &&
    - !filter_match_preds(file->filter, entry))) {
    - __trace_event_discard_commit(buffer, event);
    - return true;
    - }
    + if (likely(!(file->flags & (EVENT_FILE_FL_SOFT_DISABLED |
    + EVENT_FILE_FL_FILTERED |
    + EVENT_FILE_FL_PID_FILTER))))
    + return false;
    +
    + if (file->flags & EVENT_FILE_FL_SOFT_DISABLED)
    + goto discard;
    +
    + if (file->flags & EVENT_FILE_FL_FILTERED &&
    + !filter_match_preds(file->filter, entry))
    + goto discard;
    +
    + if ((file->flags & EVENT_FILE_FL_PID_FILTER) &&
    + trace_event_ignore_this_pid(file))
    + goto discard;

    return false;
    + discard:
    + __trace_event_discard_commit(buffer, event);
    + return true;
    }

    /**

    \
     
     \ /
      Last update: 2021-11-29 23:30    [W:4.322 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site