X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=lttng-syscalls.c;h=1fc86c8eed5a84502d05b0efd893b052975d06ca;hb=082d4946ed719b3c73759ae88753c511624af952;hp=00584e3eb2ed907cbe241b42756fe345ad5fc512;hpb=404e87bf6e1a448d1b6a93c2b67b801f039235f3;p=lttng-modules.git

diff --git a/lttng-syscalls.c b/lttng-syscalls.c
index 00584e3e..1fc86c8e 100644
--- a/lttng-syscalls.c
+++ b/lttng-syscalls.c
@@ -29,6 +29,8 @@
 #include <linux/in6.h>
 #include <linux/seq_file.h>
 #include <linux/stringify.h>
+#include <linux/file.h>
+#include <linux/anon_inodes.h>
 #include <asm/ptrace.h>
 #include <asm/syscall.h>
 
@@ -91,6 +93,7 @@ struct mmap_arg_struct;
 #define PARAMS(args...)	args
 
 /* Handle unknown syscalls */
+#undef TRACE_SYSTEM
 #define TRACE_SYSTEM syscalls_unknown
 #include "instrumentation/syscalls/headers/syscalls_unknown.h"
 #undef TRACE_SYSTEM
@@ -374,7 +377,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
 
 		filter = rcu_dereference(chan->sc_filter);
 		if (filter) {
-			if (id >= NR_compat_syscalls
+			if (id < 0 || id >= NR_compat_syscalls
 				|| !test_bit(id, filter->sc_compat)) {
 				/* System call filtered out. */
 				return;
@@ -388,7 +391,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
 
 		filter = rcu_dereference(chan->sc_filter);
 		if (filter) {
-			if (id >= NR_syscalls
+			if (id < 0 || id >= NR_syscalls
 				|| !test_bit(id, filter->sc)) {
 				/* System call filtered out. */
 				return;
@@ -398,7 +401,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
 		table_len = ARRAY_SIZE(sc_table);
 		unknown_event = chan->sc_unknown;
 	}
-	if (unlikely(id >= table_len)) {
+	if (unlikely(id < 0 || id >= table_len)) {
 		syscall_entry_unknown(unknown_event, regs, id);
 		return;
 	}
@@ -502,7 +505,7 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
 }
 
 static void syscall_exit_unknown(struct lttng_event *event,
-	struct pt_regs *regs, unsigned int id, long ret)
+	struct pt_regs *regs, int id, long ret)
 {
 	unsigned long args[UNKNOWN_SYSCALL_NRARGS];
 
@@ -528,7 +531,7 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
 
 		filter = rcu_dereference(chan->sc_filter);
 		if (filter) {
-			if (id >= NR_compat_syscalls
+			if (id < 0 || id >= NR_compat_syscalls
 				|| !test_bit(id, filter->sc_compat)) {
 				/* System call filtered out. */
 				return;
@@ -542,7 +545,7 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
 
 		filter = rcu_dereference(chan->sc_filter);
 		if (filter) {
-			if (id >= NR_syscalls
+			if (id < 0 || id >= NR_syscalls
 				|| !test_bit(id, filter->sc)) {
 				/* System call filtered out. */
 				return;
@@ -552,7 +555,7 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
 		table_len = ARRAY_SIZE(sc_exit_table);
 		unknown_event = chan->sc_exit_unknown;
 	}
-	if (unlikely(id >= table_len)) {
+	if (unlikely(id < 0 || id >= table_len)) {
 		syscall_exit_unknown(unknown_event, regs, id, ret);
 		return;
 	}
@@ -1036,6 +1039,8 @@ int lttng_syscall_filter_disable(struct lttng_channel *chan,
 	WARN_ON_ONCE(!chan->sc_table);
 
 	if (!chan->sc_filter) {
+		if (!chan->syscall_all)
+			return -EEXIST;
 		filter = kzalloc(sizeof(struct lttng_syscall_filter),
 				GFP_KERNEL);
 		if (!filter)
@@ -1227,16 +1232,70 @@ long lttng_channel_syscall_mask(struct lttng_channel *channel,
 	filter = channel->sc_filter;
 
 	for (bit = 0; bit < ARRAY_SIZE(sc_table); bit++) {
-		bt_bitfield_write_be(tmp_mask, char, bit, 1,
-			test_bit(bit, filter->sc));
+		bool state;
+
+		if (channel->sc_table) {
+			if (filter)
+				state = test_bit(bit, filter->sc);
+			else
+				state = 1;
+		} else {
+			state = 0;
+		}
+		bt_bitfield_write_be(tmp_mask, char, bit, 1, state);
 	}
 	for (; bit < sc_tables_len; bit++) {
-		bt_bitfield_write_be(tmp_mask, char, bit, 1,
-			test_bit(bit - ARRAY_SIZE(sc_table),
-				filter->sc_compat));
+		bool state;
+
+		if (channel->compat_sc_table) {
+			if (filter)
+				state = test_bit(bit - ARRAY_SIZE(sc_table),
+						filter->sc_compat);
+			else
+				state = 1;
+		} else {
+			state = 0;
+		}
+		bt_bitfield_write_be(tmp_mask, char, bit, 1, state);
 	}
 	if (copy_to_user(usyscall_mask->mask, tmp_mask, bitmask_len))
 		ret = -EFAULT;
 	kfree(tmp_mask);
 	return ret;
 }
+
+int lttng_abi_syscall_list(void)
+{
+	struct file *syscall_list_file;
+	int file_fd, ret;
+
+	file_fd = get_unused_fd();
+	if (file_fd < 0) {
+		ret = file_fd;
+		goto fd_error;
+	}
+
+	syscall_list_file = anon_inode_getfile("[lttng_syscall_list]",
+					  &lttng_syscall_list_fops,
+					  NULL, O_RDWR);
+	if (IS_ERR(syscall_list_file)) {
+		ret = PTR_ERR(syscall_list_file);
+		goto file_error;
+	}
+	ret = lttng_syscall_list_fops.open(NULL, syscall_list_file);
+	if (ret < 0)
+		goto open_error;
+	fd_install(file_fd, syscall_list_file);
+	if (file_fd < 0) {
+		ret = file_fd;
+		goto fd_error;
+	}
+	return file_fd;
+
+open_error:
+	fput(syscall_list_file);
+file_error:
+	put_unused_fd(file_fd);
+fd_error:
+	return ret;
+}