X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fsession.c;h=076d2cbc46ea9243dbe636350d01592e6d40a880;hb=ee69440bd276dbc8a5c78b0138c8e6944d571b4a;hp=75fcf4bfded58320ab6723e9ae0e574740107b24;hpb=07424f161f4afbd07fd165e4ae492726e1de7769;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index 75fcf4bfd..076d2cbc4 100644
--- a/src/bin/lttng-sessiond/session.c
+++ b/src/bin/lttng-sessiond/session.c
@@ -56,6 +56,8 @@ static struct ltt_session_list ltt_session_list = {
  */
 static unsigned int add_session_list(struct ltt_session *ls)
 {
+	assert(ls);
+
 	cds_list_add(&ls->list, &ltt_session_list.head);
 	return ltt_session_list.next_uuid++;
 }
@@ -67,6 +69,8 @@ static unsigned int add_session_list(struct ltt_session *ls)
  */
 static void del_session_list(struct ltt_session *ls)
 {
+	assert(ls);
+
 	cds_list_del(&ls->list);
 }
 
@@ -99,6 +103,8 @@ void session_unlock_list(void)
  */
 void session_lock(struct ltt_session *session)
 {
+	assert(session);
+
 	pthread_mutex_lock(&session->lock);
 }
 
@@ -107,6 +113,8 @@ void session_lock(struct ltt_session *session)
  */
 void session_unlock(struct ltt_session *session)
 {
+	assert(session);
+
 	pthread_mutex_unlock(&session->lock);
 }
 
@@ -119,6 +127,8 @@ struct ltt_session *session_find_by_name(char *name)
 {
 	struct ltt_session *iter;
 
+	assert(name);
+
 	DBG2("Trying to find session by name %s", name);
 
 	cds_list_for_each_entry(iter, &ltt_session_list.head, list) {
@@ -141,10 +151,7 @@ found:
 int session_destroy(struct ltt_session *session)
 {
 	/* Safety check */
-	if (session == NULL) {
-		ERR("Session pointer was null on session destroy");
-		return LTTCOMM_OK;
-	}
+	assert(session);
 
 	DBG("Destroying session %s", session->name);
 	del_session_list(session);
@@ -155,7 +162,7 @@ int session_destroy(struct ltt_session *session)
 	rcu_read_unlock();
 	free(session);
 
-	return LTTCOMM_OK;
+	return LTTNG_OK;
 }
 
 /*
@@ -170,33 +177,28 @@ int session_create(char *name, char *path, uid_t uid, gid_t gid)
 	new_session = zmalloc(sizeof(struct ltt_session));
 	if (new_session == NULL) {
 		PERROR("zmalloc");
-		ret = LTTCOMM_FATAL;
+		ret = LTTNG_ERR_FATAL;
 		goto error_malloc;
 	}
 
 	/* Define session name */
 	if (name != NULL) {
 		if (snprintf(new_session->name, NAME_MAX, "%s", name) < 0) {
-			ret = LTTCOMM_FATAL;
+			ret = LTTNG_ERR_FATAL;
 			goto error_asprintf;
 		}
 	} else {
 		ERR("No session name given");
-		ret = LTTCOMM_FATAL;
+		ret = LTTNG_ERR_FATAL;
 		goto error;
 	}
 
 	/* Define session system path */
 	if (path != NULL) {
 		if (snprintf(new_session->path, PATH_MAX, "%s", path) < 0) {
-			ret = LTTCOMM_FATAL;
+			ret = LTTNG_ERR_FATAL;
 			goto error_asprintf;
 		}
-		new_session->start_consumer = 1;
-	} else {
-		/* No path indicates that there is no use for a consumer. */
-		new_session->start_consumer = 0;
-		new_session->path[0] = '\0';
 	}
 
 	/* Init kernel session */
@@ -216,7 +218,7 @@ int session_create(char *name, char *path, uid_t uid, gid_t gid)
 		if (ret < 0) {
 			if (ret != -EEXIST) {
 				ERR("Trace directory creation error");
-				ret = LTTCOMM_CREATE_DIR_FAIL;
+				ret = LTTNG_ERR_CREATE_DIR_FAIL;
 				goto error;
 			}
 		}
@@ -235,14 +237,27 @@ int session_create(char *name, char *path, uid_t uid, gid_t gid)
 	DBG("Tracing session %s created in %s with ID %u by UID %d GID %d", name,
 			path, new_session->id, new_session->uid, new_session->gid);
 
-	return LTTCOMM_OK;
+	return LTTNG_OK;
 
 error:
 error_asprintf:
-	if (new_session != NULL) {
-		free(new_session);
-	}
+	free(new_session);
 
 error_malloc:
 	return ret;
 }
+
+/*
+ * Check if the UID or GID match the session. Root user has access to all
+ * sessions.
+ */
+int session_access_ok(struct ltt_session *session, uid_t uid, gid_t gid)
+{
+	assert(session);
+
+	if (uid != session->uid && gid != session->gid && uid != 0) {
+		return 0;
+	} else {
+		return 1;
+	}
+}