X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-relayd%2Fsession.c;h=de059aae203e2df17054f9bd1d415279e0bd23bf;hb=590f0324d6dfd382f79229a7934fa8b5b661641f;hp=5eedffc94e657aa924fb90ab72bf24b6056c6080;hpb=4f00620d66e81d89a546b29a774dad49d38983b3;p=lttng-tools.git

diff --git a/src/bin/lttng-relayd/session.c b/src/bin/lttng-relayd/session.c
index 5eedffc94..de059aae2 100644
--- a/src/bin/lttng-relayd/session.c
+++ b/src/bin/lttng-relayd/session.c
@@ -87,7 +87,7 @@ end:
  * Return allocated session or else NULL.
  */
 struct relay_session *session_create(const char *session_name,
-		const char *hostname,
+		const char *hostname, const char *base_path,
 		uint32_t live_timer,
 		bool snapshot,
 		const lttng_uuid sessiond_uuid,
@@ -98,7 +98,23 @@ struct relay_session *session_create(const char *session_name,
 		uint32_t minor)
 {
 	int ret;
-	struct relay_session *session;
+	struct relay_session *session = NULL;
+
+	if (session_name && strstr(session_name, ".")) {
+		ERR("Illegal character in session name: \"%s\"",
+				session_name);
+		goto error;
+	}
+	if (base_path && strstr(base_path, "../")) {
+		ERR("Invalid session base path walks up the path hierarchy: \"%s\"",
+				base_path);
+		goto error;
+	}
+	if (hostname && strstr(hostname, ".")) {
+		ERR("Invalid character in hostname: \"%s\"",
+				hostname);
+		goto error;
+	}
 
 	session = zmalloc(sizeof(*session));
 	if (!session) {
@@ -115,6 +131,12 @@ struct relay_session *session_create(const char *session_name,
 		WARN("Hostname exceeds maximal allowed length");
 		goto error;
 	}
+	if (lttng_strncpy(session->base_path, base_path,
+			sizeof(session->base_path))) {
+		WARN("Base path exceeds maximal allowed length");
+		goto error;
+	}
+
 	session->ctf_traces_ht = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
 	if (!session->ctf_traces_ht) {
 		goto error;