Fix: Check for NULL hash tables on relay daemon teardown

[lttng-tools.git] / src / bin / lttng-relayd / cmd-2-4.c

diff --git a/src/bin/lttng-relayd/cmd-2-4.c b/src/bin/lttng-relayd/cmd-2-4.c
index 45410e4e81ad912c8e7f45107ff59e50e6635f31..b269bc68a2e84473e9061afcc32697105e41a81e 100644 (file)
--- a/src/bin/lttng-relayd/cmd-2-4.c
+++ b/src/bin/lttng-relayd/cmd-2-4.c
@@ -1,6 +1,7 @@
 /*
  * Copyright (C) 2013 - Julien Desfossez <jdesfossez@efficios.com>
  *                      David Goulet <dgoulet@efficios.com>
+ *               2015 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License, version 2 only, as
@@ -16,36 +17,52 @@
  * Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <assert.h>
-#include <string.h>
 
 #include <common/common.h>
 #include <common/sessiond-comm/relayd.h>
 
+#include <common/compat/endian.h>
+#include <common/compat/string.h>
+#include <lttng/constant.h>
+
 #include "cmd-generic.h"
 #include "lttng-relayd.h"
 
-int cmd_create_session_2_4(struct relay_command *cmd,
-               struct relay_session *session)
+int cmd_create_session_2_4(struct relay_connection *conn,
+               char *session_name, char *hostname,
+               uint32_t *live_timer, bool *snapshot)
 {
        int ret;
        struct lttcomm_relayd_create_session_2_4 session_info;
+       size_t len;
 
-       assert(cmd);
-       assert(session);
-
-       ret = cmd_recv(cmd->sock, &session_info, sizeof(session_info));
+       ret = cmd_recv(conn->sock, &session_info, sizeof(session_info));
        if (ret < 0) {
                ERR("Unable to recv session info version 2.4");
                goto error;
        }
+       len = lttng_strnlen(session_info.session_name, sizeof(session_info.session_name));
+       /* Ensure that NULL-terminated and fits in local filename length. */
+       if (len == sizeof(session_info.session_name) || len >= LTTNG_NAME_MAX) {
+               ret = -ENAMETOOLONG;
+               ERR("Session name too long");
+               goto error;
+       }
+       strncpy(session_name, session_info.session_name,
+                       sizeof(session_info.session_name));
 
-       strncpy(session->session_name, session_info.session_name,
-                       sizeof(session->session_name));
-       strncpy(session->hostname, session_info.hostname,
-                       sizeof(session->hostname));
-       session->live_timer = be32toh(session_info.live_timer);
+       len = lttng_strnlen(session_info.hostname, sizeof(session_info.hostname));
+       if (len == sizeof(session_info.hostname) || len >= LTTNG_HOST_NAME_MAX) {
+               ret = -ENAMETOOLONG;
+               ERR("Session name too long");
+               goto error;
+       }
+       strncpy(hostname, session_info.hostname,
+                       sizeof(session_info.hostname));
+       *live_timer = be32toh(session_info.live_timer);
+       *snapshot = be32toh(session_info.snapshot);
 
        ret = 0;