X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.c;h=49055fb109be531af3354afcb28249b20a623d06;hp=07031a30a5c5bc6cf603b84847aac2a866919ede;hb=f5436bfcf6797b979b308a9af782750f9d079686;hpb=731848356e38d33b32fc6346ac30fba3a46a8673

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index 07031a30a..49055fb10 100644
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -16,6 +16,7 @@
  */
 
 #define _GNU_SOURCE
+#define _LGPL_SOURCE
 #include <limits.h>
 #include <inttypes.h>
 #include <stdio.h>
@@ -23,6 +24,8 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <urcu.h>
+#include <dirent.h>
+#include <sys/types.h>
 
 #include <common/common.h>
 #include <common/sessiond-comm/sessiond-comm.h>
@@ -49,6 +52,42 @@ 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.
  *
@@ -124,7 +163,7 @@ void session_unlock(struct ltt_session *session)
  * NULL is returned. This must be called with the session lock held using
  * session_lock_list and session_unlock_list.
  */
-struct ltt_session *session_find_by_name(char *name)
+struct ltt_session *session_find_by_name(const char *name)
 {
 	struct ltt_session *iter;
 
@@ -159,7 +198,7 @@ int session_destroy(struct ltt_session *session)
 	del_session_list(session);
 	pthread_mutex_destroy(&session->lock);
 
-	consumer_destroy_output(session->consumer);
+	consumer_output_put(session->consumer);
 	snapshot_destroy(&session->snapshot);
 	free(session);
 
@@ -194,6 +233,12 @@ 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) {