Fix: bytecode validator: reject specialized load field/context ref instructions

[lttng-ust.git] / src / lib / lttng-ust / lttng-bytecode.c

diff --git a/src/lib/lttng-ust/lttng-bytecode.c b/src/lib/lttng-ust/lttng-bytecode.c
index 8d3971bfe18917e910ac9a7ddd03c60cb607b30d..92258f168dd34beaeaf62b4fc7a7bdded27f582c 100644 (file)
--- a/src/lib/lttng-ust/lttng-bytecode.c
+++ b/src/lib/lttng-ust/lttng-bytecode.c
@@ -16,6 +16,7 @@
 #include "lttng-bytecode.h"
 #include "lib/lttng-ust/events.h"
 #include "common/macros.h"
+#include "common/tracer.h"
 
 static const char *opnames[] = {
        [ BYTECODE_OP_UNKNOWN ] = "UNKNOWN",
@@ -179,7 +180,7 @@ int apply_field_reloc(const struct lttng_ust_event_desc *event_desc,
                const char *field_name,
                enum bytecode_op bytecode_op)
 {
-       const struct lttng_ust_event_field **fields, *field = NULL;
+       const struct lttng_ust_event_field * const *fields, *field = NULL;
        unsigned int nr_fields, i;
        struct load_op *op;
        uint32_t field_offset = 0;
@@ -189,10 +190,10 @@ int apply_field_reloc(const struct lttng_ust_event_desc *event_desc,
        /* Lookup event by name */
        if (!event_desc)
                return -EINVAL;
-       fields = event_desc->fields;
+       fields = event_desc->tp_class->fields;
        if (!fields)
                return -EINVAL;
-       nr_fields = event_desc->nr_fields;
+       nr_fields = event_desc->tp_class->nr_fields;
        for (i = 0; i < nr_fields; i++) {
                if (fields[i]->nofilter) {
                        continue;
@@ -457,6 +458,11 @@ int link_bytecode(const struct lttng_ust_event_desc *event_desc,
        runtime->len = bytecode->bc.reloc_offset;
        /* copy original bytecode */
        memcpy(runtime->code, bytecode->bc.data, runtime->len);
+       /* Validate bytecode load instructions before relocs. */
+       ret = lttng_bytecode_validate_load(runtime);
+       if (ret) {
+               goto link_error;
+       }
        /*
         * apply relocs. Those are a uint16_t (offset in bytecode)
         * followed by a string (field name).