X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-filter-interpreter.c;h=3dad6cc6650830f2990ec410f09b523dd59573d3;hb=edfdcb685c3f56dde803244449f79ad7bed03798;hp=4e6c91a7511715f2292fda00270a3f2e9d85effe;hpb=f8d427406a03b85966a3f7a1e621a95d7275a988;p=lttng-modules.git

diff --git a/lttng-filter-interpreter.c b/lttng-filter-interpreter.c
index 4e6c91a7..3dad6cc6 100644
--- a/lttng-filter-interpreter.c
+++ b/lttng-filter-interpreter.c
@@ -1,30 +1,13 @@
-/*
+/* SPDX-License-Identifier: MIT
+ *
  * lttng-filter-interpreter.c
  *
  * LTTng modules filter interpreter.
  *
  * 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/uaccess.h>
+#include <wrapper/uaccess.h>
 #include <wrapper/frame.h>
 #include <wrapper/types.h>
 #include <linux/swab.h>
@@ -47,7 +30,7 @@ char get_char(struct estack_entry *reg, size_t offset)
 		char c;
 
 		/* Handle invalid access as end of string. */
-		if (unlikely(!access_ok(VERIFY_READ,
+		if (unlikely(!lttng_access_ok(VERIFY_READ,
 				reg->u.s.user_str + offset,
 				sizeof(c))))
 			return '\0';
@@ -572,7 +555,7 @@ static int dynamic_load_field(struct estack_entry *stack_top)
 			ret = -EINVAL;
 			goto end;
 		}
-		stack_top->u.s.seq_len = SIZE_MAX;
+		stack_top->u.s.seq_len = LTTNG_SIZE_MAX;
 		stack_top->u.s.literal_type =
 			ESTACK_STRING_LITERAL_TYPE_NONE;
 		break;
@@ -771,6 +754,8 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 		[ FILTER_OP_LOAD_FIELD_DOUBLE ] = &&LABEL_FILTER_OP_LOAD_FIELD_DOUBLE,
 
 		[ FILTER_OP_UNARY_BIT_NOT ] = &&LABEL_FILTER_OP_UNARY_BIT_NOT,
+
+		[ FILTER_OP_RETURN_S64 ] = &&LABEL_FILTER_OP_RETURN_S64,
 	};
 #endif /* #ifndef INTERPRETER_USE_SWITCH */
 
@@ -788,6 +773,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 			goto end;
 
 		OP(FILTER_OP_RETURN):
+		OP(FILTER_OP_RETURN_S64):
 			/* LTTNG_FILTER_DISCARD  or LTTNG_FILTER_RECORD_FLAG */
 			retval = !!estack_ax_v;
 			ret = 0;
@@ -1556,7 +1542,7 @@ uint64_t lttng_filter_interpret_bytecode(void *filter_data,
 				ret = -EINVAL;
 				goto end;
 			}
-			estack_ax(stack, top)->u.s.seq_len = SIZE_MAX;
+			estack_ax(stack, top)->u.s.seq_len = LTTNG_SIZE_MAX;
 			estack_ax(stack, top)->u.s.literal_type =
 				ESTACK_STRING_LITERAL_TYPE_NONE;
 			next_pc += sizeof(struct load_op);