page alloc wrapper: Fix get_pfnblock_flags_mask prototype

[lttng-modules.git] / lttng-syscalls.c

diff --git a/lttng-syscalls.c b/lttng-syscalls.c
index 49c0d81b9f2b75549ec326740d944760b13451af..97a12c4835a896e0a0e050c98d5aa5cd0e25af5a 100644 (file)
--- a/lttng-syscalls.c
+++ b/lttng-syscalls.c
@@ -27,6 +27,7 @@
 #include <wrapper/rcu.h>
 #include <wrapper/syscall.h>
 #include <lttng-events.h>
+#include <lttng-kernel-version.h>
 
 #ifndef CONFIG_COMPAT
 # ifndef is_compat_task
@@ -36,7 +37,14 @@
 
 /* in_compat_syscall appears in kernel 4.6. */
 #ifndef in_compat_syscall
- #define in_compat_syscall()   is_compat_task()
+# define in_compat_syscall()   is_compat_task()
+#endif
+
+/* in_x32_syscall appears in kernel 4.7. */
+#if (LTTNG_LINUX_VERSION_CODE < LTTNG_KERNEL_VERSION(4,7,0))
+# ifdef CONFIG_X86_X32_ABI
+#  define in_x32_syscall()     is_x32_task()
+# endif
 #endif
 
 enum sc_type {
@@ -81,7 +89,7 @@ struct timeval;
 struct itimerval;
 struct itimerspec;
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0))
 typedef __kernel_old_time_t time_t;
 #endif
 
@@ -392,6 +400,12 @@ void syscall_entry_probe(void *__data, struct pt_regs *regs, long id)
        const struct trace_syscall_entry *table, *entry;
        size_t table_len;
 
+#ifdef CONFIG_X86_X32_ABI
+       if (in_x32_syscall()) {
+               /* x32 system calls are not supported. */
+               return;
+       }
+#endif
        if (unlikely(in_compat_syscall())) {
                struct lttng_syscall_filter *filter = chan->sc_filter;
 
@@ -539,6 +553,12 @@ void syscall_exit_probe(void *__data, struct pt_regs *regs, long ret)
        size_t table_len;
        long id;
 
+#ifdef CONFIG_X86_X32_ABI
+       if (in_x32_syscall()) {
+               /* x32 system calls are not supported. */
+               return;
+       }
+#endif
        id = syscall_get_nr(current, regs);
        if (unlikely(in_compat_syscall())) {
                struct lttng_syscall_filter *filter = chan->sc_filter;
@@ -719,7 +739,7 @@ int fill_table(const struct trace_syscall_entry *table, size_t table_len,
                        ev.u.syscall.abi = LTTNG_KERNEL_SYSCALL_ABI_COMPAT;
                        break;
                }
-               strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN);
+               strncpy(ev.name, desc->name, LTTNG_KERNEL_SYM_NAME_LEN - 1);
                ev.name[LTTNG_KERNEL_SYM_NAME_LEN - 1] = '\0';
                ev.instrumentation = LTTNG_KERNEL_SYSCALL;
                chan_table[i] = _lttng_event_create(chan, &ev, filter,