X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=lttng-syscalls.c;h=4596ccfc1280f82eaefdd0b5b6462bceffee0f8f;hb=30cddf693eea0129b25c9761db6b202ddef549b3;hp=26cead68252f336221b31a3e54c9f86aeb8cdf08;hpb=ad594e3a953db1b0c3c059fde45b5a5494f6be78;p=lttng-modules.git

diff --git a/lttng-syscalls.c b/lttng-syscalls.c
index 26cead68..4596ccfc 100644
--- a/lttng-syscalls.c
+++ b/lttng-syscalls.c
@@ -81,7 +81,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
 
@@ -719,7 +719,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,
@@ -1057,7 +1057,6 @@ int lttng_syscall_filter_enable(struct lttng_channel *chan,
 	if (syscall_nr < 0)
 		return -ENOENT;
 
-
 	switch (event->u.syscall.entryexit) {
 	case LTTNG_SYSCALL_ENTRY:
 		switch (event->u.syscall.abi) {
@@ -1067,6 +1066,8 @@ int lttng_syscall_filter_enable(struct lttng_channel *chan,
 		case LTTNG_SYSCALL_ABI_COMPAT:
 			bitmap = filter->sc_compat_entry;
 			break;
+		default:
+			return -EINVAL;
 		}
 		break;
 	case LTTNG_SYSCALL_EXIT:
@@ -1077,6 +1078,8 @@ int lttng_syscall_filter_enable(struct lttng_channel *chan,
 		case LTTNG_SYSCALL_ABI_COMPAT:
 			bitmap = filter->sc_compat_exit;
 			break;
+		default:
+			return -EINVAL;
 		}
 		break;
 	default:
@@ -1113,7 +1116,6 @@ int lttng_syscall_filter_disable(struct lttng_channel *chan,
 	if (syscall_nr < 0)
 		return -ENOENT;
 
-
 	switch (event->u.syscall.entryexit) {
 	case LTTNG_SYSCALL_ENTRY:
 		switch (event->u.syscall.abi) {
@@ -1123,6 +1125,8 @@ int lttng_syscall_filter_disable(struct lttng_channel *chan,
 		case LTTNG_SYSCALL_ABI_COMPAT:
 			bitmap = filter->sc_compat_entry;
 			break;
+		default:
+			return -EINVAL;
 		}
 		break;
 	case LTTNG_SYSCALL_EXIT:
@@ -1133,6 +1137,8 @@ int lttng_syscall_filter_disable(struct lttng_channel *chan,
 		case LTTNG_SYSCALL_ABI_COMPAT:
 			bitmap = filter->sc_compat_exit;
 			break;
+		default:
+			return -EINVAL;
 		}
 		break;
 	default: