X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fcommon%2Ftracker.c;h=006535046e56c416e728eb9253a51e3ce3067f54;hb=34f6fce335fcabfbff475a92f7d8724e186478db;hp=0f69c775b75f6d1c08e213fa547bcbbf5feb7daa;hpb=74675e31d64f06986e335dffcb5e3ef5ce7c76c8;p=lttng-tools.git

diff --git a/src/common/tracker.c b/src/common/tracker.c
index 0f69c775b..006535046 100644
--- a/src/common/tracker.c
+++ b/src/common/tracker.c
@@ -20,7 +20,7 @@
 
 struct process_attr_tracker_values_comm_header {
 	uint32_t count;
-};
+} LTTNG_PACKED;
 
 struct process_attr_tracker_value_comm {
 	/* enum lttng_process_attr_value_type */
@@ -30,7 +30,7 @@ struct process_attr_tracker_value_comm {
 		/* Includes the '\0' terminator. */
 		uint32_t name_len;
 	} value;
-};
+} LTTNG_PACKED;
 
 #define GET_INTEGRAL_COMM_VALUE(value_ptr, as_type)              \
 	((as_type)(is_signed(as_type) ? (value_ptr)->u._signed : \
@@ -103,10 +103,12 @@ enum lttng_error_code process_attr_value_from_comm(
 	}
 
 	/* Only expect a payload for name value types. */
-	if (is_value_type_name(value_type) && value_view->size == 0) {
+	if (is_value_type_name(value_type) &&
+			(!value_view || value_view->size == 0)) {
 		ret = LTTNG_ERR_INVALID_PROTOCOL;
 		goto error;
-	} else if (!is_value_type_name(value_type) && value_view->size != 0) {
+	} else if (!is_value_type_name(value_type) && value_view &&
+			value_view->size != 0) {
 		ret = LTTNG_ERR_INVALID_PROTOCOL;
 		goto error;
 	}
@@ -343,9 +345,10 @@ ssize_t lttng_process_attr_values_create_from_buffer(
 
 	header_view = lttng_buffer_view_from_view(
 			buffer_view, 0, sizeof(*header));
-	if (!header_view.data) {
+	if (!lttng_buffer_view_is_valid(&header_view)) {
 		goto error;
 	}
+
 	offset = header_view.size;
 	header = (typeof(header)) header_view.data;
 
@@ -368,7 +371,7 @@ ssize_t lttng_process_attr_values_create_from_buffer(
 
 		value_view = lttng_buffer_view_from_view(
 				buffer_view, offset, sizeof(*value_comm));
-		if (!value_view.data) {
+		if (!lttng_buffer_view_is_valid(&value_view)) {
 			goto error;
 		}
 
@@ -380,8 +383,13 @@ ssize_t lttng_process_attr_values_create_from_buffer(
 			value_name_view = lttng_buffer_view_from_view(
 					buffer_view, offset,
 					value_comm->value.name_len);
+			if (!lttng_buffer_view_is_valid(&value_name_view)) {
+				goto error;
+			}
+
 			offset += value_name_view.size;
 		}
+
 		ret_code = process_attr_value_from_comm(domain, process_attr,
 				type, &value_comm->value.integral,
 				&value_name_view, &value);