X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.c;h=e7904472fb9f5f19113bef0e247160aaff999d38;hp=17dc3544dbe55a4dac884b5af9f178e2f1c44991;hb=1c1c3634276842a00492e24c3adcf847ae21edc3;hpb=dec56f6cc894de41b312354d360b6a4c09fc199d

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index 17dc3544d..e7904472f 100644
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -17,6 +17,7 @@
 
 #define _GNU_SOURCE
 #include <limits.h>
+#include <inttypes.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -48,13 +49,49 @@ static struct ltt_session_list ltt_session_list = {
 	.next_uuid = 0,
 };
 
+/* These characters are forbidden in a session name. Used by validate_name. */
+static const char *forbidden_name_chars = "/";
+
+/*
+ * Validate the session name for forbidden characters.
+ *
+ * Return 0 on success else -1 meaning a forbidden char. has been found.
+ */
+static int validate_name(const char *name)
+{
+	int ret;
+	char *tok, *tmp_name;
+
+	assert(name);
+
+	tmp_name = strdup(name);
+	if (!tmp_name) {
+		/* ENOMEM here. */
+		ret = -1;
+		goto error;
+	}
+
+	tok = strpbrk(tmp_name, forbidden_name_chars);
+	if (tok) {
+		DBG("Session name %s contains a forbidden character", name);
+		/* Forbidden character has been found. */
+		ret = -1;
+		goto error;
+	}
+	ret = 0;
+
+error:
+	free(tmp_name);
+	return ret;
+}
+
 /*
  * Add a ltt_session structure to the global list.
  *
  * The caller MUST acquire the session list lock before.
  * Returns the unique identifier for the session.
  */
-static unsigned int add_session_list(struct ltt_session *ls)
+static uint64_t add_session_list(struct ltt_session *ls)
 {
 	assert(ls);
 
@@ -147,6 +184,7 @@ found:
  * Delete session from the session list and free the memory.
  *
  * Return -1 if no session is found.  On success, return 1;
+ * Should *NOT* be called with RCU read-side lock held.
  */
 int session_destroy(struct ltt_session *session)
 {
@@ -157,9 +195,8 @@ int session_destroy(struct ltt_session *session)
 	del_session_list(session);
 	pthread_mutex_destroy(&session->lock);
 
-	rcu_read_lock();
 	consumer_destroy_output(session->consumer);
-	rcu_read_unlock();
+	snapshot_destroy(&session->snapshot);
 	free(session);
 
 	return LTTNG_OK;
@@ -193,6 +230,22 @@ int session_create(char *name, uid_t uid, gid_t gid)
 		goto error;
 	}
 
+	ret = validate_name(name);
+	if (ret < 0) {
+		ret = LTTNG_ERR_SESSION_INVALID_CHAR;
+		goto error;
+	}
+
+	ret = gethostname(new_session->hostname, sizeof(new_session->hostname));
+	if (ret < 0) {
+		if (errno == ENAMETOOLONG) {
+			new_session->hostname[sizeof(new_session->hostname) - 1] = '\0';
+		} else {
+			ret = LTTNG_ERR_FATAL;
+			goto error;
+		}
+	}
+
 	/* Init kernel session */
 	new_session->kernel_session = NULL;
 	new_session->ust_session = NULL;
@@ -203,6 +256,12 @@ int session_create(char *name, uid_t uid, gid_t gid)
 	new_session->uid = uid;
 	new_session->gid = gid;
 
+	ret = snapshot_init(&new_session->snapshot);
+	if (ret < 0) {
+		ret = LTTNG_ERR_NOMEM;
+		goto error;
+	}
+
 	/* Add new session to the session list */
 	session_lock_list();
 	new_session->id = add_session_list(new_session);
@@ -213,8 +272,8 @@ int session_create(char *name, uid_t uid, gid_t gid)
 	 * up and, if valid, assign it to the session.
 	 */
 
-	DBG("Tracing session %s created with ID %u by UID %d GID %d", name,
-			new_session->id, new_session->uid, new_session->gid);
+	DBG("Tracing session %s created with ID %" PRIu64 " by UID %d GID %d",
+			name, new_session->id, new_session->uid, new_session->gid);
 
 	return LTTNG_OK;