X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=lttng-filter.c;h=4c053fbbfb1208bb94b00bb279bf463b49226ce0;hb=refs%2Fheads%2Fstable-2.12;hp=d7fcceae8d2ca214969bb4cbcdfd570adede0e7d;hpb=3834b99f4341209754c4955ec853dc250b33ed4b;p=lttng-modules.git

diff --git a/lttng-filter.c b/lttng-filter.c
index d7fcceae..4c053fbb 100644
--- a/lttng-filter.c
+++ b/lttng-filter.c
@@ -1,27 +1,10 @@
-/*
+/* SPDX-License-Identifier: MIT
+ *
  * lttng-filter.c
  *
  * LTTng modules filter code.
  *
  * Copyright (C) 2010-2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
  */
 
 #include <linux/list.h>
@@ -40,8 +23,8 @@ static const char *opnames[] = {
 	[ FILTER_OP_MOD ] = "MOD",
 	[ FILTER_OP_PLUS ] = "PLUS",
 	[ FILTER_OP_MINUS ] = "MINUS",
-	[ FILTER_OP_RSHIFT ] = "RSHIFT",
-	[ FILTER_OP_LSHIFT ] = "LSHIFT",
+	[ FILTER_OP_BIT_RSHIFT ] = "BIT_RSHIFT",
+	[ FILTER_OP_BIT_LSHIFT ] = "BIT_LSHIFT",
 	[ FILTER_OP_BIT_AND ] = "BIT_AND",
 	[ FILTER_OP_BIT_OR ] = "BIT_OR",
 	[ FILTER_OP_BIT_XOR ] = "BIT_XOR",
@@ -169,6 +152,10 @@ static const char *opnames[] = {
 	[ FILTER_OP_LOAD_FIELD_STRING ] = "LOAD_FIELD_STRING",
 	[ FILTER_OP_LOAD_FIELD_SEQUENCE ] = "LOAD_FIELD_SEQUENCE",
 	[ FILTER_OP_LOAD_FIELD_DOUBLE ] = "LOAD_FIELD_DOUBLE",
+
+	[ FILTER_OP_UNARY_BIT_NOT ] = "UNARY_BIT_NOT",
+
+	[ FILTER_OP_RETURN_S64 ] = "RETURN_S64",
 };
 
 const char *lttng_filter_print_op(enum filter_op op)
@@ -254,14 +241,31 @@ int apply_field_reloc(struct lttng_event *event,
 			op->op = FILTER_OP_LOAD_FIELD_REF_S64;
 			break;
 		case atype_array:
+		{
+			const struct lttng_basic_type *elem_type = &field->type.u.array.elem_type;
+
+			if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
+				return -EINVAL;
+			if (elem_type->u.basic.integer.user)
+				op->op = FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE;
+			else
+				op->op = FILTER_OP_LOAD_FIELD_REF_SEQUENCE;
+			break;
+		}
 		case atype_sequence:
-			if (field->user)
+		{
+			const struct lttng_basic_type *elem_type = &field->type.u.sequence.elem_type;
+
+			if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
+				return -EINVAL;
+			if (elem_type->u.basic.integer.user)
 				op->op = FILTER_OP_LOAD_FIELD_REF_USER_SEQUENCE;
 			else
 				op->op = FILTER_OP_LOAD_FIELD_REF_SEQUENCE;
 			break;
+		}
 		case atype_string:
-			if (field->user)
+			if (field->type.u.basic.string.user)
 				op->op = FILTER_OP_LOAD_FIELD_REF_USER_STRING;
 			else
 				op->op = FILTER_OP_LOAD_FIELD_REF_STRING;
@@ -324,10 +328,28 @@ int apply_context_reloc(struct lttng_event *event,
 			op->op = FILTER_OP_GET_CONTEXT_REF_S64;
 			break;
 			/* Sequence and array supported as string */
-		case atype_string:
 		case atype_array:
+		{
+			const struct lttng_basic_type *elem_type = &ctx_field->event_field.type.u.array.elem_type;
+
+			if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
+				return -EINVAL;
+			BUG_ON(elem_type->u.basic.integer.user);
+			op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
+			break;
+		}
 		case atype_sequence:
-			BUG_ON(ctx_field->event_field.user);
+		{
+			const struct lttng_basic_type *elem_type = &ctx_field->event_field.type.u.sequence.elem_type;
+
+			if (elem_type->atype != atype_integer || elem_type->u.basic.integer.encoding == lttng_encode_none)
+				return -EINVAL;
+			BUG_ON(elem_type->u.basic.integer.user);
+			op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
+			break;
+		}
+		case atype_string:
+			BUG_ON(ctx_field->event_field.type.u.basic.string.user);
 			op->op = FILTER_OP_GET_CONTEXT_REF_STRING;
 			break;
 		case atype_struct:	/* Unsupported. */
@@ -433,6 +455,11 @@ int _lttng_filter_event_link_bytecode(struct lttng_event *event,
 	runtime->len = filter_bytecode->bc.reloc_offset;
 	/* copy original bytecode */
 	memcpy(runtime->code, filter_bytecode->bc.data, runtime->len);
+	/* Validate bytecode load instructions before relocs. */
+	ret = lttng_filter_validate_bytecode_load(runtime);
+	if (ret) {
+		goto link_error;
+	}
 	/*
 	 * apply relocs. Those are a uint16_t (offset in bytecode)
 	 * followed by a string (field name).