From: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Date: Sat, 14 Sep 2019 20:53:22 +0000 (-0400)
Subject: relayd: clean-up: strncpy uses the length of the source as length
X-Git-Tag: v2.12.0-rc1~378
X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=commitdiff_plain;h=885e05c50f81e77fc3a14a36064c4ef702127cd7;hp=fc1465822a1075d98160bb74ae8e974ac8c010a8

relayd: clean-up: strncpy uses the length of the source as length

strncpy is used with the source length of both session_name and
hostname. This doesn't make sense at face value. However, this is not
a "bug" as both src and dst are guaranteed to be the same length in
all existing code paths.

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

diff --git a/src/bin/lttng-relayd/cmd-2-4.c b/src/bin/lttng-relayd/cmd-2-4.c
index f420ad928..ac6e04258 100644
--- a/src/bin/lttng-relayd/cmd-2-4.c
+++ b/src/bin/lttng-relayd/cmd-2-4.c
@@ -53,8 +53,7 @@ int cmd_create_session_2_4(const struct lttng_buffer_view *payload,
 		ERR("Session name too long");
 		goto error;
 	}
-	strncpy(session_name, session_info.session_name,
-			sizeof(session_info.session_name));
+	strncpy(session_name, session_info.session_name, LTTNG_PATH_MAX);
 
 	len = lttng_strnlen(session_info.hostname, sizeof(session_info.hostname));
 	if (len == sizeof(session_info.hostname) || len >= LTTNG_HOST_NAME_MAX) {
@@ -62,8 +61,7 @@ int cmd_create_session_2_4(const struct lttng_buffer_view *payload,
 		ERR("Session name too long");
 		goto error;
 	}
-	strncpy(hostname, session_info.hostname,
-			sizeof(session_info.hostname));
+	strncpy(hostname, session_info.hostname, LTTNG_HOST_NAME_MAX);
 
 	*live_timer = be32toh(session_info.live_timer);
 	*snapshot = be32toh(session_info.snapshot);