From: Julien Desfossez <jdesfossez@efficios.com>
Date: Wed, 23 Aug 2017 20:43:22 +0000 (-0400)
Subject: Fix: the return code of lttcomm_send_unix_sock is signed
X-Git-Tag: v2.11.0-rc1~435
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=66ab32be7aabac934946764a656e617a054622ac;hp=56efeab366da412ee4196107c08174f32ed83c9a

Fix: the return code of lttcomm_send_unix_sock is signed

Signed-off-by: Julien Desfossez <jdesfossez@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
---

diff --git a/src/common/kernel-consumer/kernel-consumer.c b/src/common/kernel-consumer/kernel-consumer.c
index 7bcb86a36..a5dcc663d 100644
--- a/src/common/kernel-consumer/kernel-consumer.c
+++ b/src/common/kernel-consumer/kernel-consumer.c
@@ -983,7 +983,8 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 	}
 	case LTTNG_CONSUMER_DISCARDED_EVENTS:
 	{
-		uint64_t ret;
+		ssize_t ret;
+		uint64_t count;
 		struct lttng_consumer_channel *channel;
 		uint64_t id = msg.u.discarded_events.session_id;
 		uint64_t key = msg.u.discarded_events.channel_key;
@@ -995,15 +996,15 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		if (!channel) {
 			ERR("Kernel consumer discarded events channel %"
 					PRIu64 " not found", key);
-			ret = 0;
+			count = 0;
 		} else {
-			ret = channel->discarded_events;
+			count = channel->discarded_events;
 		}
 
 		health_code_update();
 
 		/* Send back returned value to session daemon */
-		ret = lttcomm_send_unix_sock(sock, &ret, sizeof(ret));
+		ret = lttcomm_send_unix_sock(sock, &count, sizeof(count));
 		if (ret < 0) {
 			PERROR("send discarded events");
 			goto error_fatal;
@@ -1013,7 +1014,8 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 	}
 	case LTTNG_CONSUMER_LOST_PACKETS:
 	{
-		uint64_t ret;
+		ssize_t ret;
+		uint64_t count;
 		struct lttng_consumer_channel *channel;
 		uint64_t id = msg.u.lost_packets.session_id;
 		uint64_t key = msg.u.lost_packets.channel_key;
@@ -1025,15 +1027,15 @@ int lttng_kconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
 		if (!channel) {
 			ERR("Kernel consumer lost packets channel %"
 					PRIu64 " not found", key);
-			ret = 0;
+			count = 0;
 		} else {
-			ret = channel->lost_packets;
+			count = channel->lost_packets;
 		}
 
 		health_code_update();
 
 		/* Send back returned value to session daemon */
-		ret = lttcomm_send_unix_sock(sock, &ret, sizeof(ret));
+		ret = lttcomm_send_unix_sock(sock, &count, sizeof(count));
 		if (ret < 0) {
 			PERROR("send lost packets");
 			goto error_fatal;