Filter: validate that field ref strings are non-NULL

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/liblttng-ust/lttng-filter.c b/liblttng-ust/lttng-filter.c
index db4d107a63df629f07af9c3b2cf6f82858cd92bc..19775c3098c939a3d1d9b496e453c6cfd49dcd3d 100644 (file)
--- a/liblttng-ust/lttng-filter.c
+++ b/liblttng-ust/lttng-filter.c
@@ -696,6 +696,11 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                                ref->offset);
                        reg[insn->reg].str =
                                *(const char * const *) &filter_stack_data[ref->offset];
+                       if (unlikely(!reg[insn->reg].str)) {
+                               dbg_printf("Filter warning: loading a NULL string.\n");
+                               ret = -EINVAL;
+                               goto end;
+                       }
                        reg[insn->reg].type = REG_STRING;
                        reg[insn->reg].seq_len = UINT_MAX;
                        reg[insn->reg].literal = 0;
@@ -716,6 +721,11 @@ int lttng_filter_interpret_bytecode(void *filter_data,
                        reg[insn->reg].str =
                                *(const char **) (&filter_stack_data[ref->offset
                                                                + sizeof(unsigned long)]);
+                       if (unlikely(!reg[insn->reg].str)) {
+                               dbg_printf("Filter warning: loading a NULL sequence.\n");
+                               ret = -EINVAL;
+                               goto end;
+                       }
                        reg[insn->reg].type = REG_STRING;
                        reg[insn->reg].literal = 0;
                        next_pc += sizeof(struct load_op) + sizeof(struct field_ref);