Fix: Accept bytecode of length 65536 bytes

[lttng-tools.git] / src / lib / lttng-ctl / filter / filter-visitor-generate-bytecode.c

diff --git a/src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c b/src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c
index 71da21c8a5108a8f0114aa9389c16d92bc54240a..332a3875a6039e449970bb9ad0b266278b55cb11 100644 (file)
--- a/src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c
+++ b/src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c
@@ -95,14 +95,15 @@ int32_t bytecode_reserve(struct lttng_filter_bytecode_alloc **fb, uint32_t align
        int32_t ret;
        uint32_t padding = offset_align((*fb)->b.len, align);
 
+       if ((*fb)->b.len + padding + len > LTTNG_FILTER_MAX_LEN)
+               return -EINVAL;
+
        if ((*fb)->b.len + padding + len > (*fb)->alloc_len) {
                uint32_t new_len =
                        max_t(uint32_t, 1U << get_count_order((*fb)->b.len + padding + len),
                                (*fb)->alloc_len << 1);
                uint32_t old_len = (*fb)->alloc_len;
 
-               if (new_len > 0xFFFF)
-                       return -EINVAL;
                *fb = realloc(*fb, sizeof(struct lttng_filter_bytecode_alloc) + new_len);
                if (!*fb)
                        return -ENOMEM;
@@ -238,7 +239,7 @@ int visit_node_load(struct filter_parser_ctx *ctx, struct ir_op *node)
                uint32_t insn_len = sizeof(struct load_op)
                        + sizeof(struct field_ref);
                struct field_ref ref_offset;
-               uint16_t reloc_offset;
+               uint32_t reloc_offset;
 
                insn = calloc(insn_len, 1);
                if (!insn)