X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Flttng-event-notifier-notification.c;h=ecbc0676291c4e9f425cdbbb86ad1ea37656c04a;hb=HEAD;hp=a4e945673633a4cc7c761a73aa388b5678c74106;hpb=cbb2c0a178a4154ec086c73b3247c255b8ac1fea;p=lttng-modules.git

diff --git a/src/lttng-event-notifier-notification.c b/src/lttng-event-notifier-notification.c
index a4e94567..29d2d156 100644
--- a/src/lttng-event-notifier-notification.c
+++ b/src/lttng-event-notifier-notification.c
@@ -5,6 +5,7 @@
  * Copyright (C) 2020 Francis Deslauriers <francis.deslauriers@efficios.com>
  */
 
+#include <asm/barrier.h>
 #include <linux/bug.h>
 
 #include <lttng/lttng-bytecode.h>
@@ -13,7 +14,6 @@
 #include <lttng/event-notifier-notification.h>
 #include <lttng/events-internal.h>
 #include <lttng/probe-user.h>
-#include <wrapper/barrier.h>
 
 /*
  * The capture buffer size needs to be below 1024 bytes to avoid the
@@ -81,6 +81,8 @@ int capture_enum(struct lttng_msgpack_writer *writer,
 		break;
 	default:
 		WARN_ON_ONCE(1);
+		ret = -1;
+		goto end;
 	}
 
 	ret = lttng_msgpack_end_map(writer);
@@ -89,8 +91,9 @@ end:
 }
 
 static
-int64_t capture_sequence_element_signed(uint8_t *ptr,
-		const struct lttng_kernel_type_integer *type)
+int capture_sequence_element_signed(uint8_t *ptr,
+		const struct lttng_kernel_type_integer *type,
+		int64_t *_value)
 {
 	int64_t value = 0;
 	unsigned int size = type->size;
@@ -104,7 +107,7 @@ int64_t capture_sequence_element_signed(uint8_t *ptr,
 
 		if (user) {
 			if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(int8_t)))
-				tmp = 0;
+				return -1;
 		} else {
 			tmp = *ptr;
 		}
@@ -117,7 +120,7 @@ int64_t capture_sequence_element_signed(uint8_t *ptr,
 
 		if (user) {
 			if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(int16_t)))
-				tmp = 0;
+				return -1;
 		} else {
 			tmp = *(int16_t *) ptr;
 		}
@@ -132,7 +135,7 @@ int64_t capture_sequence_element_signed(uint8_t *ptr,
 
 		if (user) {
 			if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(int32_t)))
-				tmp = 0;
+				return -1;
 		} else {
 			tmp = *(int32_t *) ptr;
 		}
@@ -147,7 +150,7 @@ int64_t capture_sequence_element_signed(uint8_t *ptr,
 
 		if (user) {
 			if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(int64_t)))
-				tmp = 0;
+				return -1;
 		} else {
 			tmp = *(int64_t *) ptr;
 		}
@@ -158,14 +161,17 @@ int64_t capture_sequence_element_signed(uint8_t *ptr,
 	}
 	default:
 		WARN_ON_ONCE(1);
+		return -1;
 	}
 
-	return value;
+	*_value = value;
+	return 0;
 }
 
 static
-uint64_t capture_sequence_element_unsigned(uint8_t *ptr,
-		const struct lttng_kernel_type_integer *type)
+int capture_sequence_element_unsigned(uint8_t *ptr,
+		const struct lttng_kernel_type_integer *type,
+		uint64_t *_value)
 {
 	uint64_t value = 0;
 	unsigned int size = type->size;
@@ -179,7 +185,7 @@ uint64_t capture_sequence_element_unsigned(uint8_t *ptr,
 
 		if (user) {
 			if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(uint8_t)))
-				tmp = 0;
+				return -1;
 		} else {
 			tmp = *ptr;
 		}
@@ -192,7 +198,7 @@ uint64_t capture_sequence_element_unsigned(uint8_t *ptr,
 
 		if (user) {
 			if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(uint16_t)))
-				tmp = 0;
+				return -1;
 		} else {
 			tmp = *(uint16_t *) ptr;
 		}
@@ -207,7 +213,7 @@ uint64_t capture_sequence_element_unsigned(uint8_t *ptr,
 
 		if (user) {
 			if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(uint32_t)))
-				tmp = 0;
+				return -1;
 		} else {
 			tmp = *(uint32_t *) ptr;
 		}
@@ -222,7 +228,7 @@ uint64_t capture_sequence_element_unsigned(uint8_t *ptr,
 
 		if (user) {
 			if (lttng_copy_from_user_check_nofault(&tmp, ptr, sizeof(uint64_t)))
-				tmp = 0;
+				return -1;
 		} else {
 			tmp = *(uint64_t *) ptr;
 		}
@@ -233,11 +239,14 @@ uint64_t capture_sequence_element_unsigned(uint8_t *ptr,
 	}
 	default:
 		WARN_ON_ONCE(1);
+		return -1;
 	}
 
-	return value;
+	*_value = value;
+	return 0;
 }
 
+static
 int capture_sequence(struct lttng_msgpack_writer *writer,
 		struct lttng_interpreter_output *output)
 {
@@ -271,14 +280,24 @@ int capture_sequence(struct lttng_msgpack_writer *writer,
 	signedness = integer_type->signedness;
 	for (i = 0; i < output->u.sequence.nr_elem; i++) {
 		if (signedness) {
-			ret = lttng_msgpack_write_signed_integer(writer,
-				capture_sequence_element_signed(ptr, integer_type));
+			int64_t v;
+
+			ret = capture_sequence_element_signed(ptr, integer_type, &v);
+			if (ret) {
+				goto end;
+			}
+			ret = lttng_msgpack_write_signed_integer(writer, v);
 			if (ret) {
 				goto end;
 			}
 		} else {
-			ret = lttng_msgpack_write_unsigned_integer(writer,
-				capture_sequence_element_unsigned(ptr, integer_type));
+			uint64_t v;
+
+			ret = capture_sequence_element_unsigned(ptr, integer_type, &v);
+			if (ret) {
+				goto end;
+			}
+			ret = lttng_msgpack_write_unsigned_integer(writer, v);
 			if (ret) {
 				goto end;
 			}
@@ -380,11 +399,11 @@ void record_error(struct lttng_kernel_event_notifier *event_notifier)
 	int ret;
 
 	/*
-	 * lttng_smp_load_acquire paired with lttng_smp_store_release orders
-	 * creation of the error counter and setting error_counter_len
-	 * before the error_counter is used.
+	 * smp_load_acquire paired with smp_store_release orders creation of
+	 * the error counter and setting error_counter_len before the
+	 * error_counter is used.
 	 */
-	error_counter = lttng_smp_load_acquire(&event_notifier_group->error_counter);
+	error_counter = smp_load_acquire(&event_notifier_group->error_counter);
 	/* This group may not have an error counter attached to it. */
 	if (!error_counter)
 		return;