2 files changed, 10 insertions, 2 deletions

diff --git a/kernel/trace/trace.h b/kernel/trace/trace.h
index d2612016de94..3d2ad5f83e94 100644
--- a/kernel/trace/trace.h
+++ b/kernel/trace/trace.h
@@ -1312,7 +1312,7 @@ void trace_event_init(void);
 void trace_event_enum_update(struct trace_enum_map **map, int len);
 #else
 static inline void __init trace_event_init(void) { }
-static inlin void trace_event_enum_update(struct trace_enum_map **map, int len) { }
+static inline void trace_event_enum_update(struct trace_enum_map **map, int len) { }
 #endif
 
 extern struct trace_iterator *tracepoint_print_iter;
diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index 9d4a78f45dc4..1c92dfa1dd17 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -1056,6 +1056,9 @@ static void parse_init(struct filter_parse_state *ps,
 
 static char infix_next(struct filter_parse_state *ps)
 {
+        if (!ps->infix.cnt)
+                return 0;
+
         ps->infix.cnt--;
 
         return ps->infix.string[ps->infix.tail++];
@@ -1071,6 +1074,9 @@ static char infix_peek(struct filter_parse_state *ps)
 
 static void infix_advance(struct filter_parse_state *ps)
 {
+        if (!ps->infix.cnt)
+                return;
+
         ps->infix.cnt--;
         ps->infix.tail++;
 }
@@ -1385,7 +1391,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) {