X-Git-Url: https://git.liburcu.org/?a=blobdiff_plain;f=lttng-filter-validator.c;h=123a13084f92ea5c7b535f67a3c0aecbda9bd4a2;hb=bbf3aef542f1d86cb2a2a304444ef7529d01eb6b;hp=446fc41bbda9b657a615871ed779b59c2b527227;hpb=5e13eb3cd47abc717bb2e02dce5d26dc94281134;p=lttng-modules.git diff --git a/lttng-filter-validator.c b/lttng-filter-validator.c index 446fc41b..123a1308 100644 --- a/lttng-filter-validator.c +++ b/lttng-filter-validator.c @@ -3,29 +3,33 @@ * * LTTng modules filter bytecode validator. * - * Copyright (C) 2010-2014 Mathieu Desnoyers + * Copyright (C) 2010-2016 Mathieu Desnoyers * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; only - * version 2.1 of the License. + * 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: * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * 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 #include #include -#include "wrapper/list.h" -#include "lttng-filter.h" +#include +#include #define MERGE_POINT_TABLE_BITS 7 #define MERGE_POINT_TABLE_SIZE (1U << MERGE_POINT_TABLE_BITS) @@ -166,7 +170,7 @@ error_mismatch: */ static int bytecode_validate_overflow(struct bytecode_runtime *bytecode, - void *start_pc, void *pc) + char *start_pc, char *pc) { int ret = 0; @@ -387,8 +391,8 @@ unsigned long delete_all_nodes(struct mp_table *mp_table) static int validate_instruction_context(struct bytecode_runtime *bytecode, struct vstack *stack, - void *start_pc, - void *pc) + char *start_pc, + char *pc) { int ret = 0; @@ -724,8 +728,8 @@ static int validate_instruction_all_contexts(struct bytecode_runtime *bytecode, struct mp_table *mp_table, struct vstack *stack, - void *start_pc, - void *pc) + char *start_pc, + char *pc) { int ret, found = 0; unsigned long target_pc = pc - start_pc; @@ -773,11 +777,11 @@ static int exec_insn(struct bytecode_runtime *bytecode, struct mp_table *mp_table, struct vstack *stack, - void **_next_pc, - void *pc) + char **_next_pc, + char *pc) { int ret = 1; - void *next_pc = *_next_pc; + char *next_pc = *_next_pc; switch (*(filter_opcode_t *) pc) { case FILTER_OP_UNKNOWN: @@ -1017,7 +1021,7 @@ end: int lttng_filter_validate_bytecode(struct bytecode_runtime *bytecode) { struct mp_table *mp_table; - void *pc, *next_pc, *start_pc; + char *pc, *next_pc, *start_pc; int ret = -EINVAL; struct vstack stack;