X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-comm%2Flttng-ust-comm.c;h=543465edf2fe2e2ee703a0d62e1b4c800d5d2f0d;hb=fb31eb73d8a4a6d9784ed5c335b7fa3b9684108c;hp=9fe6d288d633a2ec67c8d78a82cf90d2e52dc2c2;hpb=6548fca464f68be5ded73be6b9a479daf08e62d6;p=lttng-ust.git

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index 9fe6d288..543465ed 100644
--- a/liblttng-ust-comm/lttng-ust-comm.c
+++ b/liblttng-ust-comm/lttng-ust-comm.c
@@ -19,6 +19,7 @@
 
 #define _GNU_SOURCE
 #include <limits.h>
+#include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -598,7 +599,7 @@ ssize_t ustcomm_recv_channel_from_sessiond(int sock,
 {
 	void *chan_data;
 	ssize_t len, nr_fd;
-	int wakeup_fd;
+	int wakeup_fd, ret;
 
 	if (var_len > LTTNG_UST_CHANNEL_DATA_MAX_LEN) {
 		len = -EINVAL;
@@ -627,9 +628,21 @@ ssize_t ustcomm_recv_channel_from_sessiond(int sock,
 			goto error_recv;
 		}
 	}
-	*_wakeup_fd = wakeup_fd;
-	lttng_ust_add_fd_to_tracker(wakeup_fd);
+
+	ret = lttng_ust_add_fd_to_tracker(wakeup_fd);
+	if (ret < 0) {
+		lttng_ust_unlock_fd_tracker();
+		ret = close(wakeup_fd);
+		if (ret) {
+			PERROR("close on wakeup_fd");
+		}
+		len = -EIO;
+		goto error_recv;
+	}
+
+	*_wakeup_fd = ret;
 	lttng_ust_unlock_fd_tracker();
+
 	*_chan_data = chan_data;
 	return len;
 
@@ -661,10 +674,35 @@ int ustcomm_recv_stream_from_sessiond(int sock,
 			goto error;
 		}
 	}
-	*shm_fd = fds[0];
-	*wakeup_fd = fds[1];
-	lttng_ust_add_fd_to_tracker(fds[0]);
-	lttng_ust_add_fd_to_tracker(fds[1]);
+
+	ret = lttng_ust_add_fd_to_tracker(fds[0]);
+	if (ret < 0) {
+		lttng_ust_unlock_fd_tracker();
+		ret = close(fds[0]);
+		if (ret) {
+			PERROR("close on received shm_fd");
+		}
+		ret = -EIO;
+		goto error;
+	}
+	*shm_fd = ret;
+
+	ret = lttng_ust_add_fd_to_tracker(fds[1]);
+	if (ret < 0) {
+		lttng_ust_unlock_fd_tracker();
+		ret = close(*shm_fd);
+		if (ret) {
+			PERROR("close on shm_fd");
+		}
+		*shm_fd = -1;
+		ret = close(fds[1]);
+		if (ret) {
+			PERROR("close on received wakeup_fd");
+		}
+		ret = -EIO;
+		goto error;
+	}
+	*wakeup_fd = ret;
 	lttng_ust_unlock_fd_tracker();
 	return 0;
 
@@ -816,12 +854,15 @@ static
 int serialize_integer_type(struct ustctl_integer_type *uit,
 		const struct lttng_integer_type *lit)
 {
+	int32_t encoding;
+
 	uit->size = lit->size;
 	uit->signedness = lit->signedness;
 	uit->reverse_byte_order = lit->reverse_byte_order;
 	uit->base = lit->base;
-	if (serialize_string_encoding(&uit->encoding, lit->encoding))
+	if (serialize_string_encoding(&encoding, lit->encoding))
 		return -EINVAL;
+	uit->encoding = encoding;
 	uit->alignment = lit->alignment;
 	return 0;
 }
@@ -843,9 +884,11 @@ int serialize_basic_type(struct lttng_session *session,
 	}
 	case atype_string:
 	{
-		if (serialize_string_encoding(&ubt->string.encoding,
-				lbt->string.encoding))
+		int32_t encoding;
+
+		if (serialize_string_encoding(&encoding, lbt->string.encoding))
 			return -EINVAL;
+		ubt->string.encoding = encoding;
 		*uatype = ustctl_atype_string;
 		break;
 	}
@@ -874,8 +917,7 @@ int serialize_basic_type(struct lttng_session *session,
 		if (session) {
 			const struct lttng_enum *_enum;
 
-			_enum = lttng_ust_enum_get(session,
-					lbt->enumeration.desc->name);
+			_enum = lttng_ust_enum_get_from_desc(session, lbt->enumeration.desc);
 			if (!_enum)
 				return -EINVAL;
 			ubt->enumeration.id = _enum->id;
@@ -971,13 +1013,15 @@ int serialize_one_field(struct lttng_session *session,
 	{
 		struct ustctl_field *uf = &fields[*iter_output];
 		struct ustctl_type *ut = &uf->type;
+		enum ustctl_abstract_types atype;
 
 		strncpy(uf->name, lf->name, LTTNG_UST_SYM_NAME_LEN);
 		uf->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
-		ret = serialize_basic_type(session, &ut->atype, lt->atype,
+		ret = serialize_basic_type(session, &atype, lt->atype,
 			&ut->u.basic, &lt->u.basic);
 		if (ret)
 			return ret;
+		ut->atype = atype;
 		(*iter_output)++;
 		break;
 	}
@@ -987,6 +1031,7 @@ int serialize_one_field(struct lttng_session *session,
 		struct ustctl_type *ut = &uf->type;
 		struct ustctl_basic_type *ubt;
 		const struct lttng_basic_type *lbt;
+		enum ustctl_abstract_types atype;
 
 		strncpy(uf->name, lf->name, LTTNG_UST_SYM_NAME_LEN);
 		uf->name[LTTNG_UST_SYM_NAME_LEN - 1] = '\0';
@@ -994,10 +1039,11 @@ int serialize_one_field(struct lttng_session *session,
 		ubt = &ut->u.array.elem_type;
 		lbt = &lt->u.array.elem_type;
 		ut->u.array.length = lt->u.array.length;
-		ret = serialize_basic_type(session, &ubt->atype, lbt->atype,
+		ret = serialize_basic_type(session, &atype, lbt->atype,
 			&ubt->u.basic, &lbt->u.basic);
 		if (ret)
 			return -EINVAL;
+		ubt->atype = atype;
 		ut->atype = ustctl_atype_array;
 		(*iter_output)++;
 		break;
@@ -1008,6 +1054,7 @@ int serialize_one_field(struct lttng_session *session,
 		struct ustctl_type *ut = &uf->type;
 		struct ustctl_basic_type *ubt;
 		const struct lttng_basic_type *lbt;
+		enum ustctl_abstract_types atype;
 		int ret;
 
 		strncpy(uf->name, lf->name, LTTNG_UST_SYM_NAME_LEN);
@@ -1015,16 +1062,18 @@ int serialize_one_field(struct lttng_session *session,
 		uf->type.atype = ustctl_atype_sequence;
 		ubt = &ut->u.sequence.length_type;
 		lbt = &lt->u.sequence.length_type;
-		ret = serialize_basic_type(session, &ubt->atype, lbt->atype,
+		ret = serialize_basic_type(session, &atype, lbt->atype,
 			&ubt->u.basic, &lbt->u.basic);
 		if (ret)
 			return -EINVAL;
+		ubt->atype = atype;
 		ubt = &ut->u.sequence.elem_type;
 		lbt = &lt->u.sequence.elem_type;
-		ret = serialize_basic_type(session, &ubt->atype, lbt->atype,
+		ret = serialize_basic_type(session, &atype, lbt->atype,
 			&ubt->u.basic, &lbt->u.basic);
 		if (ret)
 			return -EINVAL;
+		ubt->atype = atype;
 		ut->atype = ustctl_atype_sequence;
 		(*iter_output)++;
 		break;