projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: Possible dereference of null pointers
[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 52c69567c37422b1039c544185b7289a3433eff4..4dd52d8d0eed988a7c97e88bd5dc80449b0480fb 100644
(file)
--- a/
src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c
+++ b/
src/lib/lttng-ctl/filter/filter-visitor-generate-bytecode.c
@@
-22,11
+22,14
@@
#include <stdlib.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
#include <string.h>
#include <errno.h>
-#include "align.h"
+#include <common/align.h>
+
#include "filter-bytecode.h"
#include "filter-ir.h"
#include "filter-ast.h"
#include "filter-bytecode.h"
#include "filter-ir.h"
#include "filter-ast.h"
+#include <common/macros.h>
+
#ifndef max_t
#define max_t(type, a, b) ((type) ((a) > (b) ? (a) : (b)))
#endif
#ifndef max_t
#define max_t(type, a, b) ((type) ((a) > (b) ? (a) : (b)))
#endif
@@
-105,11
+108,14
@@
int32_t bytecode_reserve(struct lttng_filter_bytecode_alloc **fb, uint32_t align
return -EINVAL;
if (new_alloc_len > old_alloc_len) {
return -EINVAL;
if (new_alloc_len > old_alloc_len) {
+ struct lttng_filter_bytecode_alloc *newptr;
+
new_alloc_len =
max_t(uint32_t, 1U << get_count_order(new_alloc_len), old_alloc_len << 1);
new_alloc_len =
max_t(uint32_t, 1U << get_count_order(new_alloc_len), old_alloc_len << 1);
-
*fb
= realloc(*fb, new_alloc_len);
- if (!
*fb
)
+
newptr
= realloc(*fb, new_alloc_len);
+ if (!
newptr
)
return -ENOMEM;
return -ENOMEM;
+ *fb = newptr;
/* We zero directly the memory from start of allocation. */
memset(&((char *) *fb)[old_alloc_len], 0, new_alloc_len - old_alloc_len);
(*fb)->alloc_len = new_alloc_len;
/* We zero directly the memory from start of allocation. */
memset(&((char *) *fb)[old_alloc_len], 0, new_alloc_len - old_alloc_len);
(*fb)->alloc_len = new_alloc_len;
@@
-217,7
+223,7
@@
int visit_node_load(struct filter_parser_ctx *ctx, struct ir_op *node)
if (!insn)
return -ENOMEM;
insn->op = FILTER_OP_LOAD_S64;
if (!insn)
return -ENOMEM;
insn->op = FILTER_OP_LOAD_S64;
-
*(int64_t *) insn->data = node->u.load.u.num
;
+
memcpy(insn->data, &node->u.load.u.num, sizeof(int64_t))
;
ret = bytecode_push(&ctx->bytecode, insn, 1, insn_len);
free(insn);
return ret;
ret = bytecode_push(&ctx->bytecode, insn, 1, insn_len);
free(insn);
return ret;
@@
-232,12
+238,13
@@
int visit_node_load(struct filter_parser_ctx *ctx, struct ir_op *node)
if (!insn)
return -ENOMEM;
insn->op = FILTER_OP_LOAD_DOUBLE;
if (!insn)
return -ENOMEM;
insn->op = FILTER_OP_LOAD_DOUBLE;
-
*(double *) insn->data = node->u.load.u.flt
;
+
memcpy(insn->data, &node->u.load.u.flt, sizeof(double))
;
ret = bytecode_push(&ctx->bytecode, insn, 1, insn_len);
free(insn);
return ret;
}
ret = bytecode_push(&ctx->bytecode, insn, 1, insn_len);
free(insn);
return ret;
}
- case IR_DATA_FIELD_REF:
+ case IR_DATA_FIELD_REF: /* fall-through */
+ case IR_DATA_GET_CONTEXT_REF:
{
struct load_op *insn;
uint32_t insn_len = sizeof(struct load_op)
{
struct load_op *insn;
uint32_t insn_len = sizeof(struct load_op)
@@
-249,7
+256,17
@@
int visit_node_load(struct filter_parser_ctx *ctx, struct ir_op *node)
insn = calloc(insn_len, 1);
if (!insn)
return -ENOMEM;
insn = calloc(insn_len, 1);
if (!insn)
return -ENOMEM;
- insn->op = FILTER_OP_LOAD_FIELD_REF;
+ switch(node->data_type) {
+ case IR_DATA_FIELD_REF:
+ insn->op = FILTER_OP_LOAD_FIELD_REF;
+ break;
+ case IR_DATA_GET_CONTEXT_REF:
+ insn->op = FILTER_OP_GET_CONTEXT_REF;
+ break;
+ default:
+ free(insn);
+ return -EINVAL;
+ }
ref_offset.offset = (uint16_t) -1U;
memcpy(insn->data, &ref_offset, sizeof(ref_offset));
/* reloc_offset points to struct load_op */
ref_offset.offset = (uint16_t) -1U;
memcpy(insn->data, &ref_offset, sizeof(ref_offset));
/* reloc_offset points to struct load_op */
@@
-409,11
+426,13
@@
int visit_node_logical(struct filter_parser_ctx *ctx, struct ir_op *node)
if (ret)
return ret;
/* Cast to s64 if float or field ref */
if (ret)
return ret;
/* Cast to s64 if float or field ref */
- if (node->u.binary.left->data_type == IR_DATA_FIELD_REF
+ if ((node->u.binary.left->data_type == IR_DATA_FIELD_REF
+ || node->u.binary.left->data_type == IR_DATA_GET_CONTEXT_REF)
|| node->u.binary.left->data_type == IR_DATA_FLOAT) {
struct cast_op cast_insn;
|| node->u.binary.left->data_type == IR_DATA_FLOAT) {
struct cast_op cast_insn;
- if (node->u.binary.left->data_type == IR_DATA_FIELD_REF) {
+ if (node->u.binary.left->data_type == IR_DATA_FIELD_REF
+ || node->u.binary.left->data_type == IR_DATA_GET_CONTEXT_REF) {
cast_insn.op = FILTER_OP_CAST_TO_S64;
} else {
cast_insn.op = FILTER_OP_CAST_DOUBLE_TO_S64;
cast_insn.op = FILTER_OP_CAST_TO_S64;
} else {
cast_insn.op = FILTER_OP_CAST_DOUBLE_TO_S64;
@@
-446,11
+465,13
@@
int visit_node_logical(struct filter_parser_ctx *ctx, struct ir_op *node)
if (ret)
return ret;
/* Cast to s64 if float or field ref */
if (ret)
return ret;
/* Cast to s64 if float or field ref */
- if (node->u.binary.right->data_type == IR_DATA_FIELD_REF
+ if ((node->u.binary.right->data_type == IR_DATA_FIELD_REF
+ || node->u.binary.right->data_type == IR_DATA_GET_CONTEXT_REF)
|| node->u.binary.right->data_type == IR_DATA_FLOAT) {
struct cast_op cast_insn;
|| node->u.binary.right->data_type == IR_DATA_FLOAT) {
struct cast_op cast_insn;
- if (node->u.binary.right->data_type == IR_DATA_FIELD_REF) {
+ if (node->u.binary.right->data_type == IR_DATA_FIELD_REF
+ || node->u.binary.right->data_type == IR_DATA_GET_CONTEXT_REF) {
cast_insn.op = FILTER_OP_CAST_TO_S64;
} else {
cast_insn.op = FILTER_OP_CAST_DOUBLE_TO_S64;
cast_insn.op = FILTER_OP_CAST_TO_S64;
} else {
cast_insn.op = FILTER_OP_CAST_DOUBLE_TO_S64;
@@
-497,16
+518,25
@@
int recursive_visit_gen_bytecode(struct filter_parser_ctx *ctx,
}
}
}
}
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
void filter_bytecode_free(struct filter_parser_ctx *ctx)
{
void filter_bytecode_free(struct filter_parser_ctx *ctx)
{
- free(ctx->bytecode);
- ctx->bytecode = NULL;
- free(ctx->bytecode_reloc);
- ctx->bytecode_reloc = NULL;
+ if (!ctx) {
+ return;
+ }
+
+ if (ctx->bytecode) {
+ free(ctx->bytecode);
+ ctx->bytecode = NULL;
+ }
+
+ if (ctx->bytecode_reloc) {
+ free(ctx->bytecode_reloc);
+ ctx->bytecode_reloc = NULL;
+ }
}
}
-__attribute__((visibility("hidden")))
+LTTNG_HIDDEN
int filter_visitor_bytecode_generate(struct filter_parser_ctx *ctx)
{
int ret;
int filter_visitor_bytecode_generate(struct filter_parser_ctx *ctx)
{
int ret;
This page took
0.035362 seconds
and
5
git commands to generate.