#include <linux/in.h>
#include <linux/in6.h>
#include <linux/seq_file.h>
+#include <linux/stringify.h>
#include <asm/ptrace.h>
#include <asm/syscall.h>
+#include "lib/bitfield.h"
#include "wrapper/tracepoint.h"
#include "lttng-events.h"
SC_TYPE_COMPAT_EXIT,
};
-#define SYSCALL_ENTRY_STR "syscall_entry_"
-#define COMPAT_SYSCALL_ENTRY_STR "compat_syscall_entry_"
-#define SYSCALL_EXIT_STR "syscall_exit_"
-#define COMPAT_SYSCALL_EXIT_STR "compat_syscall_exit_"
+#define SYSCALL_ENTRY_TOK syscall_entry_
+#define COMPAT_SYSCALL_ENTRY_TOK compat_syscall_entry_
+#define SYSCALL_EXIT_TOK syscall_exit_
+#define COMPAT_SYSCALL_EXIT_TOK compat_syscall_exit_
+
+#define SYSCALL_ENTRY_STR __stringify(SYSCALL_ENTRY_TOK)
+#define COMPAT_SYSCALL_ENTRY_STR __stringify(COMPAT_SYSCALL_ENTRY_TOK)
+#define SYSCALL_EXIT_STR __stringify(SYSCALL_EXIT_TOK)
+#define COMPAT_SYSCALL_EXIT_STR __stringify(COMPAT_SYSCALL_EXIT_TOK)
static
void syscall_entry_probe(void *__data, struct pt_regs *regs, long id);
#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
#undef TP_PROBE_CB
#define TP_PROBE_CB(_template) &syscall_entry_probe
#define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _struct, _assign, _printk) \
- LTTNG_TRACEPOINT_EVENT(syscall_enter_##_name, PARAMS(_proto), PARAMS(_args), \
+ LTTNG_TRACEPOINT_EVENT(syscall_entry_##_name, PARAMS(_proto), PARAMS(_args), \
PARAMS(_struct), PARAMS(_assign), PARAMS(_printk))
#define SC_LTTNG_TRACEPOINT_EVENT_CODE(_name, _proto, _args, _locvar, _code, _struct, _assign, _printk) \
- LTTNG_TRACEPOINT_EVENT_CODE(syscall_enter_##_name, PARAMS(_proto), PARAMS(_args), \
+ LTTNG_TRACEPOINT_EVENT_CODE(syscall_entry_##_name, PARAMS(_proto), PARAMS(_args), \
PARAMS(_locvar), PARAMS(_code), \
PARAMS(_struct), PARAMS(_assign), PARAMS(_printk))
#define SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(_name, _struct, _assign, _printk) \
- LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(syscall_enter_##_name, PARAMS(_struct), PARAMS(_assign), \
+ LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(syscall_entry_##_name, PARAMS(_struct), PARAMS(_assign), \
PARAMS(_printk))
#define SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name) \
- LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscall_enter_##_template, syscall_enter_##_name)
+ LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(syscall_entry_##_template, syscall_entry_##_name)
#undef TRACE_SYSTEM
-#define TRACE_SYSTEM syscall_enter_integers
+#define TRACE_SYSTEM syscall_entry_integers
#define TRACE_INCLUDE_FILE syscalls_integers
#include "instrumentation/syscalls/headers/syscalls_integers.h"
#undef TRACE_INCLUDE_FILE
#undef TRACE_SYSTEM
-#define TRACE_SYSTEM syscall_enter_pointers
+#define TRACE_SYSTEM syscall_entry_pointers
#define TRACE_INCLUDE_FILE syscalls_pointers
#include "instrumentation/syscalls/headers/syscalls_pointers.h"
#undef TRACE_INCLUDE_FILE
/* Hijack probe callback for compat system call enter */
#define TP_PROBE_CB(_template) &syscall_entry_probe
#define SC_LTTNG_TRACEPOINT_EVENT(_name, _proto, _args, _struct, _assign, _printk) \
- LTTNG_TRACEPOINT_EVENT(compat_syscall_enter_##_name, PARAMS(_proto), PARAMS(_args), \
+ LTTNG_TRACEPOINT_EVENT(compat_syscall_entry_##_name, PARAMS(_proto), PARAMS(_args), \
PARAMS(_struct), PARAMS(_assign), \
PARAMS(_printk))
#define SC_LTTNG_TRACEPOINT_EVENT_CODE(_name, _proto, _args, _locvar, _code, _struct, _assign, _printk) \
- LTTNG_TRACEPOINT_EVENT_CODE(compat_syscall_enter_##_name, PARAMS(_proto), PARAMS(_args), \
+ LTTNG_TRACEPOINT_EVENT_CODE(compat_syscall_entry_##_name, PARAMS(_proto), PARAMS(_args), \
PARAMS(_locvar), PARAMS(_code), \
PARAMS(_struct), PARAMS(_assign), PARAMS(_printk))
#define SC_LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(_name, _struct, _assign, _printk) \
- LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(compat_syscall_enter_##_name, PARAMS(_struct), \
+ LTTNG_TRACEPOINT_EVENT_CLASS_NOARGS(compat_syscall_entry_##_name, PARAMS(_struct), \
PARAMS(_assign), PARAMS(_printk))
#define SC_LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(_template, _name) \
- LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(compat_syscall_enter_##_template, \
- compat_syscall_enter_##_name)
-#define TRACE_SYSTEM compat_syscall_enter_integers
+ LTTNG_TRACEPOINT_EVENT_INSTANCE_NOARGS(compat_syscall_entry_##_template, \
+ compat_syscall_entry_##_name)
+#define TRACE_SYSTEM compat_syscall_entry_integers
#define TRACE_INCLUDE_FILE compat_syscalls_integers
#include "instrumentation/syscalls/headers/compat_syscalls_integers.h"
#undef TRACE_INCLUDE_FILE
#undef TRACE_SYSTEM
-#define TRACE_SYSTEM compat_syscall_enter_pointers
+#define TRACE_SYSTEM compat_syscall_entry_pointers
#define TRACE_INCLUDE_FILE compat_syscalls_pointers
#include "instrumentation/syscalls/headers/compat_syscalls_pointers.h"
#undef TRACE_INCLUDE_FILE
#undef TRACE_SYSCALL_TABLE
#define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs) \
[ _nr ] = { \
- .func = __event_probe__syscall_enter_##_template, \
+ .func = __event_probe__syscall_entry_##_template, \
.nrargs = (_nrargs), \
- .fields = __event_fields___syscall_enter_##_template, \
- .desc = &__event_desc___syscall_enter_##_name, \
+ .fields = __event_fields___syscall_entry_##_template, \
+ .desc = &__event_desc___syscall_entry_##_name, \
},
/* Syscall enter tracing table */
#undef TRACE_SYSCALL_TABLE
#define TRACE_SYSCALL_TABLE(_template, _name, _nr, _nrargs) \
[ _nr ] = { \
- .func = __event_probe__compat_syscall_enter_##_template, \
+ .func = __event_probe__compat_syscall_entry_##_template, \
.nrargs = (_nrargs), \
- .fields = __event_fields___compat_syscall_enter_##_template, \
- .desc = &__event_desc___compat_syscall_enter_##_name, \
+ .fields = __event_fields___compat_syscall_entry_##_template, \
+ .desc = &__event_desc___compat_syscall_entry_##_name, \
},
/* Compat syscall enter table */
syscall_get_arguments(current, regs, 0, UNKNOWN_SYSCALL_NRARGS, args);
if (unlikely(is_compat_task()))
- __event_probe__compat_syscall_enter_unknown(event, id, args);
+ __event_probe__compat_syscall_entry_unknown(event, id, args);
else
- __event_probe__syscall_enter_unknown(event, id, args);
+ __event_probe__syscall_entry_unknown(event, id, args);
}
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;
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;
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;
}
}
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];
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;
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;
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;
}
#endif
if (!chan->sc_unknown) {
const struct lttng_event_desc *desc =
- &__event_desc___syscall_enter_unknown;
+ &__event_desc___syscall_entry_unknown;
memset(&ev, 0, sizeof(ev));
strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN);
if (!chan->sc_compat_unknown) {
const struct lttng_event_desc *desc =
- &__event_desc___compat_syscall_enter_unknown;
+ &__event_desc___compat_syscall_entry_unknown;
memset(&ev, 0, sizeof(ev));
strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN);
return syscall_nr;
}
+static
+uint32_t get_sc_tables_len(void)
+{
+ return ARRAY_SIZE(sc_table) + ARRAY_SIZE(compat_sc_table);
+}
+
int lttng_syscall_filter_enable(struct lttng_channel *chan,
const char *name)
{
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)
}
if (!name) {
+ /* Fail if all syscalls are already disabled. */
+ if (bitmap_empty(filter->sc, NR_syscalls)
+ && bitmap_empty(filter->sc_compat,
+ NR_compat_syscalls)) {
+ ret = -EEXIST;
+ goto error;
+ }
+
/* Disable all system calls */
bitmap_clear(filter->sc, 0, NR_syscalls);
bitmap_clear(filter->sc_compat, 0, NR_compat_syscalls);
goto error;
}
if (syscall_nr >= 0) {
- if (!test_bit(syscall_nr, chan->sc_filter->sc)) {
+ if (!test_bit(syscall_nr, filter->sc)) {
ret = -EEXIST;
goto error;
}
- bitmap_clear(chan->sc_filter->sc, syscall_nr, 1);
+ bitmap_clear(filter->sc, syscall_nr, 1);
}
if (compat_syscall_nr >= 0) {
- if (!test_bit(compat_syscall_nr, chan->sc_filter->sc_compat)) {
+ if (!test_bit(compat_syscall_nr, filter->sc_compat)) {
ret = -EEXIST;
goto error;
}
- bitmap_clear(chan->sc_filter->sc_compat, compat_syscall_nr, 1);
+ bitmap_clear(filter->sc_compat, compat_syscall_nr, 1);
}
apply_filter:
if (!chan->sc_filter)
{
}
+static
+int get_sc_table(const struct trace_syscall_entry *entry,
+ const struct trace_syscall_entry **table,
+ unsigned int *bitness)
+{
+ if (entry >= sc_table && entry < sc_table + ARRAY_SIZE(sc_table)) {
+ if (bitness)
+ *bitness = BITS_PER_LONG;
+ if (table)
+ *table = sc_table;
+ return 0;
+ }
+ if (!(entry >= compat_sc_table
+ && entry < compat_sc_table + ARRAY_SIZE(compat_sc_table))) {
+ return -EINVAL;
+ }
+ if (bitness)
+ *bitness = 32;
+ if (table)
+ *table = compat_sc_table;
+ return 0;
+}
+
static
int syscall_list_show(struct seq_file *m, void *p)
{
const struct trace_syscall_entry *table, *entry = p;
unsigned int bitness;
+ unsigned long index;
+ int ret;
+ const char *name;
- if (entry >= sc_table && entry < sc_table + ARRAY_SIZE(sc_table)) {
- bitness = BITS_PER_LONG;
- table = sc_table;
+ ret = get_sc_table(entry, &table, &bitness);
+ if (ret)
+ return ret;
+ if (!entry->desc)
+ return 0;
+ if (table == sc_table) {
+ index = entry - table;
+ name = &entry->desc->name[strlen(SYSCALL_ENTRY_STR)];
} else {
- bitness = 32;
- table = compat_sc_table;
- WARN_ON_ONCE(!(entry >= compat_sc_table
- && entry < compat_sc_table + ARRAY_SIZE(compat_sc_table)));
+ index = (entry - table) + ARRAY_SIZE(sc_table);
+ name = &entry->desc->name[strlen(COMPAT_SYSCALL_ENTRY_STR)];
}
- seq_printf(m, "syscall { name = %s; bitness = %u; };\n",
- entry->desc->name,
- bitness);
+ seq_printf(m, "syscall { index = %lu; name = %s; bitness = %u; };\n",
+ index, name, bitness);
return 0;
}
.llseek = seq_lseek,
.release = seq_release,
};
+
+long lttng_channel_syscall_mask(struct lttng_channel *channel,
+ struct lttng_kernel_syscall_mask __user *usyscall_mask)
+{
+ uint32_t len, sc_tables_len, bitmask_len;
+ int ret = 0, bit;
+ char *tmp_mask;
+ struct lttng_syscall_filter *filter;
+
+ ret = get_user(len, &usyscall_mask->len);
+ if (ret)
+ return ret;
+ sc_tables_len = get_sc_tables_len();
+ bitmask_len = ALIGN(sc_tables_len, 8) >> 3;
+ if (len < sc_tables_len) {
+ return put_user(sc_tables_len, &usyscall_mask->len);
+ }
+ /* Array is large enough, we can copy array to user-space. */
+ tmp_mask = kzalloc(bitmask_len, GFP_KERNEL);
+ if (!tmp_mask)
+ return -ENOMEM;
+ filter = channel->sc_filter;
+
+ for (bit = 0; bit < ARRAY_SIZE(sc_table); bit++) {
+ 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++) {
+ 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;
+}