*
* LTTng modules filter bytecode validator.
*
- * Copyright (C) 2010-2014 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright (C) 2010-2016 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
- * 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 <linux/list.h>
+#include <linux/types.h>
#include <linux/jhash.h>
#include <linux/slab.h>
-#include "lttng-filter.h"
+#include <wrapper/list.h>
+#include <lttng-filter.h>
#define MERGE_POINT_TABLE_BITS 7
#define MERGE_POINT_TABLE_SIZE (1U << MERGE_POINT_TABLE_BITS)
memcpy(&mp_node->stack, stack, sizeof(mp_node->stack));
head = &mp_table->mp_head[hash & (MERGE_POINT_TABLE_SIZE - 1)];
- hlist_for_each_entry(lookup_node, head, node) {
+ lttng_hlist_for_each_entry(lookup_node, head, node) {
if (lttng_hash_match(lookup_node, target_pc)) {
found = 1;
break;
target_pc);
return -EINVAL;
}
+ } else {
+ hlist_add_head(&mp_node->node, head);
}
- hlist_add_head(&mp_node->node, head);
return 0;
}
*/
static
int bytecode_validate_overflow(struct bytecode_runtime *bytecode,
- void *start_pc, void *pc)
+ char *start_pc, char *pc)
{
int ret = 0;
struct hlist_head *head;
head = &mp_table->mp_head[i];
- hlist_for_each_entry_safe(mp_node, tmp, head, node) {
+ lttng_hlist_for_each_entry_safe(mp_node, tmp, head, node) {
kfree(mp_node);
nr_nodes++;
}
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;
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;
/* Validate merge points */
hash = jhash_1word(target_pc, 0);
head = &mp_table->mp_head[hash & (MERGE_POINT_TABLE_SIZE - 1)];
- hlist_for_each_entry(mp_node, head, node) {
+ lttng_hlist_for_each_entry(mp_node, head, node) {
if (lttng_hash_match(mp_node, target_pc)) {
found = 1;
break;
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:
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;