Skip to content

Commit

Permalink
tracing/filter: Do not WARN on operand count going below zero
Browse files Browse the repository at this point in the history
When testing the fix for the trace filter, I could not come up with
a scenario where the operand count goes below zero, so I added a
WARN_ON_ONCE(cnt < 0) to the logic. But there is legitimate case
that it can happen (although the filter would be wrong).

 # echo '>' > /sys/kernel/debug/events/ext4/ext4_truncate_exit/filter

That is, a single operation without any operands will hit the path
where the WARN_ON_ONCE() can trigger. Although this is harmless,
and the filter is reported as a error. But instead of spitting out
a warning to the kernel dmesg, just fail nicely and report it via
the proper channels.

Link: http://lkml.kernel.org/r/[email protected]

Reported-by: Vince Weaver <[email protected]>
Reported-by: Sasha Levin <[email protected]>
Cc: [email protected] # 2.6.33+
Signed-off-by: Steven Rostedt <[email protected]>
  • Loading branch information
rostedt committed Jun 25, 2015
1 parent 2cf30dc commit b4875bb
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion kernel/trace/trace_events_filter.c
Original file line number Diff line number Diff line change
Expand Up @@ -1385,7 +1385,9 @@ static int check_preds(struct filter_parse_state *ps)
if (elt->op != OP_NOT)
cnt--;
n_normal_preds++;
WARN_ON_ONCE(cnt < 0);
/* all ops should have operands */
if (cnt < 0)
break;
}

if (cnt != 1 || !n_normal_preds || n_logical_preds >= n_normal_preds) {
Expand Down

0 comments on commit b4875bb

Please sign in to comment.