Fix possible NULL UST session on start trace

[lttng-tools.git] / lttng-sessiond / ust-app.c

diff --git a/lttng-sessiond/ust-app.c b/lttng-sessiond/ust-app.c
index e22a5929ecf77322a68a48a776b5380e999c4eb4..99fd84f3e07ca5982875ab257dd7f2146d9c225f 100644 (file)
--- a/lttng-sessiond/ust-app.c
+++ b/lttng-sessiond/ust-app.c
@@ -113,7 +113,6 @@ static struct ust_app *find_app_by_sock(int sock)
                        (void *)((unsigned long) sock), sizeof(void *), &iter);
        if (node == NULL) {
                DBG2("UST app find by sock %d key not found", sock);
-               rcu_read_unlock();
                goto error;
        }
 
@@ -123,7 +122,6 @@ static struct ust_app *find_app_by_sock(int sock)
                        (void *)((unsigned long) key->pid), sizeof(void *), &iter);
        if (node == NULL) {
                DBG2("UST app find by sock %d not found", sock);
-               rcu_read_unlock();
                goto error;
        }
 
@@ -153,7 +151,6 @@ struct ust_app *ust_app_find_by_pid(pid_t pid)
        node = hashtable_lookup(ust_app_ht,
                        (void *)((unsigned long) pid), sizeof(void *), &iter);
        if (node == NULL) {
-               rcu_read_unlock();
                DBG2("UST app no found with pid %d", pid);
                goto error;
        }
@@ -164,6 +161,7 @@ struct ust_app *ust_app_find_by_pid(pid_t pid)
        return caa_container_of(node, struct ust_app, node);
 
 error:
+       rcu_read_unlock();
        return NULL;
 }