cppcheck: don't check NULL pointer before freeing them

[lttng-tools.git] / src / bin / lttng-sessiond / session.c

diff --git a/src/bin/lttng-sessiond/session.c b/src/bin/lttng-sessiond/session.c
index e445363ea03d214d90a4f4ded762ad9593d818b1..6fb6bd3602256abffe4b8f0922e0a9baeb57bc32 100644 (file)
--- 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,17 +151,18 @@ 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);
        pthread_mutex_destroy(&session->lock);
+
+       rcu_read_lock();
+       consumer_destroy_output(session->consumer);
+       rcu_read_unlock();
        free(session);
 
-       return LTTCOMM_OK;
+       return LTTNG_OK;
 }
 
 /*
@@ -166,26 +177,26 @@ 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;
@@ -212,7 +223,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;
                        }
                }
@@ -231,14 +242,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;
+       }
+}