X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fmain.c;h=6d800f50b3c0db40de5997ead9625fee8cf8938c;hp=0446d9cb04dcddce51d919ca6d0e27160ed25bdc;hb=4169f5ad171ab88ac181ec4080f46af379bc7676;hpb=a6cd2b97ca69d302670109fef8340bd927270a30

diff --git a/src/bin/lttng-relayd/main.c b/src/bin/lttng-relayd/main.c
index 0446d9cb0..6d800f50b 100644
--- a/src/bin/lttng-relayd/main.c
+++ b/src/bin/lttng-relayd/main.c
@@ -254,7 +254,7 @@ int notify_thread_pipe(int wpipe)
 	do {
 		ret = write(wpipe, "!", 1);
 	} while (ret < 0 && errno == EINTR);
-	if (ret < 0) {
+	if (ret < 0 || ret != 1) {
 		PERROR("write poll pipe");
 	}
 
@@ -669,7 +669,7 @@ void *relay_thread_dispatcher(void *data)
 						sizeof(struct relay_command));
 			} while (ret < 0 && errno == EINTR);
 			free(relay_cmd);
-			if (ret < 0) {
+			if (ret < 0 || ret != sizeof(struct relay_command)) {
 				PERROR("write cmd pipe");
 				goto error;
 			}
@@ -958,6 +958,7 @@ error:
 	send_ret = cmd->sock->ops->sendmsg(cmd->sock, &reply, sizeof(reply), 0);
 	if (send_ret < 0) {
 		ERR("Relayd sending session id");
+		ret = send_ret;
 	}
 
 	return ret;
@@ -983,7 +984,6 @@ int relay_add_stream(struct lttcomm_relayd_hdr *recv_hdr,
 		goto end_no_session;
 	}
 
-	/* FIXME : use data_size for something ? */
 	ret = cmd->sock->ops->recvmsg(cmd->sock, &stream_info,
 			sizeof(struct lttcomm_relayd_add_stream), 0);
 	if (ret < sizeof(struct lttcomm_relayd_add_stream)) {
@@ -1055,6 +1055,7 @@ end:
 			sizeof(struct lttcomm_relayd_status_stream), 0);
 	if (send_ret < 0) {
 		ERR("Relay sending stream id");
+		ret = send_ret;
 	}
 	rcu_read_unlock();
 
@@ -1144,6 +1145,7 @@ end_unlock:
 			sizeof(struct lttcomm_relayd_generic_reply), 0);
 	if (send_ret < 0) {
 		ERR("Relay sending stream id");
+		ret = send_ret;
 	}
 
 end_no_session:
@@ -1244,7 +1246,7 @@ static int write_padding_to_file(int fd, uint32_t size)
 	do {
 		ret = write(fd, zeros, size);
 	} while (ret < 0 && errno == EINTR);
-	if (ret < 0) {
+	if (ret < 0 || ret != size) {
 		PERROR("write padding to file");
 	}
 
@@ -1322,7 +1324,7 @@ int relay_recv_metadata(struct lttcomm_relayd_hdr *recv_hdr,
 		ret = write(metadata_stream->fd, metadata_struct->payload,
 				payload_size);
 	} while (ret < 0 && errno == EINTR);
-	if (ret < payload_size) {
+	if (ret < 0 || ret != payload_size) {
 		ERR("Relay error writing metadata on file");
 		ret = -1;
 		goto end_unlock;
@@ -1804,7 +1806,7 @@ int relay_process_data(struct relay_command *cmd, struct lttng_ht *streams_ht)
 	do {
 		ret = write(stream->fd, data_buffer, data_size);
 	} while (ret < 0 && errno == EINTR);
-	if (ret < data_size) {
+	if (ret < 0 || ret != data_size) {
 		ERR("Relay error writing data to file");
 		ret = -1;
 		goto end_unlock;