X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Flttng-abi.c;h=eb68bce8d15328da889e4f1077c87f779aa4b37d;hb=88a82b1744612c10d95ba86dec6f8919b325ec77;hp=7096daf7a544358202e14f49ae210d13397c48b2;hpb=6657edecc8dd4f294c42339645151006f60b3811;p=lttng-modules.git

diff --git a/src/lttng-abi.c b/src/lttng-abi.c
index 7096daf7..eb68bce8 100644
--- a/src/lttng-abi.c
+++ b/src/lttng-abi.c
@@ -54,7 +54,7 @@
 
 static struct proc_dir_entry *lttng_proc_dentry;
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0))
 static const struct proc_ops lttng_proc_ops;
 #else
 static const struct file_operations lttng_proc_ops;
@@ -464,7 +464,7 @@ long lttng_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
 	}
 }
 
-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0))
+#if (LTTNG_LINUX_VERSION_CODE >= LTTNG_KERNEL_VERSION(5,6,0))
 static const struct proc_ops lttng_proc_ops = {
 	.proc_ioctl = lttng_ioctl,
 #ifdef CONFIG_COMPAT
@@ -1725,8 +1725,8 @@ int lttng_abi_validate_event_param(struct lttng_kernel_event *event_param)
 	switch (event_param->instrumentation) {
 	case LTTNG_KERNEL_SYSCALL:
 		switch (event_param->u.syscall.entryexit) {
-		case LTTNG_KERNEL_SYSCALL_ENTRY:
-		case LTTNG_KERNEL_SYSCALL_EXIT:
+		case LTTNG_KERNEL_SYSCALL_ENTRY:	/* Fall-through */
+		case LTTNG_KERNEL_SYSCALL_EXIT:		/* Fall-through */
 		case LTTNG_KERNEL_SYSCALL_ENTRYEXIT:
 			break;
 		default:
@@ -1746,14 +1746,24 @@ int lttng_abi_validate_event_param(struct lttng_kernel_event *event_param)
 		}
 		break;
 
-	case LTTNG_KERNEL_TRACEPOINT:	/* Fallthrough */
-	case LTTNG_KERNEL_KPROBE:	/* Fallthrough */
-	case LTTNG_KERNEL_KRETPROBE:	/* Fallthrough */
-	case LTTNG_KERNEL_NOOP:		/* Fallthrough */
+	case LTTNG_KERNEL_KRETPROBE:
+		switch (event_param->u.kretprobe.entryexit) {
+		case LTTNG_KERNEL_SYSCALL_ENTRYEXIT:
+			break;
+		case LTTNG_KERNEL_SYSCALL_ENTRY:	/* Fall-through */
+		case LTTNG_KERNEL_SYSCALL_EXIT:		/* Fall-through */
+		default:
+			return -EINVAL;
+		}
+		break;
+
+	case LTTNG_KERNEL_TRACEPOINT:	/* Fall-through */
+	case LTTNG_KERNEL_KPROBE:	/* Fall-through */
 	case LTTNG_KERNEL_UPROBE:
 		break;
 
-	case LTTNG_KERNEL_FUNCTION:	/* Fallthrough */
+	case LTTNG_KERNEL_FUNCTION:	/* Fall-through */
+	case LTTNG_KERNEL_NOOP:		/* Fall-through */
 	default:
 		return -EINVAL;
 	}