Fix: illegal memory access in relayd_add_stream

[lttng-tools.git] / src / common / relayd / relayd.c

diff --git a/src/common/relayd/relayd.c b/src/common/relayd/relayd.c
index 38ebdbde229454c7c98304171786552ce4bdcbdd..c8f2ef5f49cc8d75a2d6fb82d49383294862cb91 100644 (file)
--- a/src/common/relayd/relayd.c
+++ b/src/common/relayd/relayd.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -129,8 +130,15 @@ static int relayd_create_session_2_4(struct lttcomm_relayd_sock *rsock,
        int ret;
        struct lttcomm_relayd_create_session_2_4 msg;
 
-       strncpy(msg.session_name, session_name, sizeof(msg.session_name));
-       strncpy(msg.hostname, hostname, sizeof(msg.hostname));
+       if (lttng_strncpy(msg.session_name, session_name,
+                       sizeof(msg.session_name))) {
+               ret = -1;
+               goto error;
+       }
+       if (lttng_strncpy(msg.hostname, hostname, sizeof(msg.hostname))) {
+               ret = -1;
+               goto error;
+       }
        msg.live_timer = htobe32(session_live_timer);
        msg.snapshot = htobe32(snapshot);
 
@@ -247,8 +255,16 @@ int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam
        /* Compat with relayd 2.1 */
        if (rsock->minor == 1) {
                memset(&msg, 0, sizeof(msg));
-               strncpy(msg.channel_name, channel_name, sizeof(msg.channel_name));
-               strncpy(msg.pathname, pathname, sizeof(msg.pathname));
+               if (lttng_strncpy(msg.channel_name, channel_name,
+                               sizeof(msg.channel_name))) {
+                       ret = -1;
+                       goto error;
+               }
+               if (lttng_strncpy(msg.pathname, pathname,
+                               sizeof(msg.pathname))) {
+                       ret = -1;
+                       goto error;
+               }
 
                /* Send command */
                ret = send_command(rsock, RELAYD_ADD_STREAM, (void *) &msg, sizeof(msg), 0);
@@ -258,8 +274,16 @@ int relayd_add_stream(struct lttcomm_relayd_sock *rsock, const char *channel_nam
        } else {
                memset(&msg_2_2, 0, sizeof(msg_2_2));
                /* Compat with relayd 2.2+ */
-               strncpy(msg_2_2.channel_name, channel_name, sizeof(msg_2_2.channel_name));
-               strncpy(msg_2_2.pathname, pathname, sizeof(msg_2_2.pathname));
+               if (lttng_strncpy(msg_2_2.channel_name, channel_name,
+                               sizeof(msg_2_2.channel_name))) {
+                       ret = -1;
+                       goto error;
+               }
+               if (lttng_strncpy(msg_2_2.pathname, pathname,
+                               sizeof(msg_2_2.pathname))) {
+                       ret = -1;
+                       goto error;
+               }
                msg_2_2.tracefile_size = htobe64(tracefile_size);
                msg_2_2.tracefile_count = htobe64(tracefile_count);