1 files changed, 5 insertions, 0 deletions

diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events_filter.c
index 9fca8bb1c06b..026be412f356 100644
--- a/kernel/trace/trace_events_filter.c
+++ b/kernel/trace/trace_events_filter.c
@@ -237,9 +237,14 @@ int filter_add_pred(struct ftrace_event_call *call, struct filter_pred *pred)
         pred->offset = field->offset;
 
         if (is_string_field(field->type)) {
+                if (!pred->str_val)
+                        return -EINVAL;
                 pred->fn = filter_pred_string;
                 pred->str_len = field->size;
                 return __filter_add_pred(call, pred);
+        } else {
+                if (pred->str_val)
+                        return -EINVAL;
         }
 
         switch (field->size) {