diff options
| author | Steven Rostedt (VMware) <rostedt@goodmis.org> | 2021-11-26 17:34:42 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-12-01 09:23:29 +0100 |
| commit | e09e868c6341057e1b7d3acd9bd1c199a7007cc9 (patch) | |
| tree | 0f8582bfb2d3abf3dee41b435bb2c612fd76d930 | |
| parent | f5bbebfd7ca15ba7ebbed801ecb76ebf59b35cbd (diff) | |
| download | linux-stable-e09e868c6341057e1b7d3acd9bd1c199a7007cc9.tar.gz linux-stable-e09e868c6341057e1b7d3acd9bd1c199a7007cc9.tar.bz2 linux-stable-e09e868c6341057e1b7d3acd9bd1c199a7007cc9.zip | |
tracing: Fix pid filtering when triggers are attached
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>
| -rw-r--r-- | kernel/trace/trace.h | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h index 35e9a01b5480..1d514a1a3155 100644 --- a/kernel/trace/trace.h +++ b/kernel/trace/trace.h @@ -1423,14 +1423,26 @@ __event_trigger_test_discard(struct trace_event_file *file, if (eflags & EVENT_FILE_FL_TRIGGER_COND) *tt = event_triggers_call(file, 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; } /** |