fix: relayd: unaligned access in trace_chunk_registry_ht_key_hash

[lttng-tools.git] / src / bin / lttng-sessiond / context.cpp

diff --git a/src/bin/lttng-sessiond/context.cpp b/src/bin/lttng-sessiond/context.cpp
index cccf1c0d51b0bf80a3cad888ebae128cd4102c4c..79c454809cdb3f65f97da0526130c635e16207a2 100644 (file)
--- a/src/bin/lttng-sessiond/context.cpp
+++ b/src/bin/lttng-sessiond/context.cpp
@@ -15,10 +15,9 @@
 
 #include <common/error.hpp>
 #include <common/sessiond-comm/sessiond-comm.hpp>
+#include <common/urcu.hpp>
 
 #include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
 #include <unistd.h>
 #include <urcu/list.h>
 
@@ -51,7 +50,7 @@ static int add_kctx_all_channels(struct ltt_kernel_session *ksession,
 
                /* Ownership of kctx_copy is transferred to the callee. */
                ret = kernel_add_channel_context(kchan, kctx_copy);
-               kctx_copy = NULL;
+               kctx_copy = nullptr;
                if (ret != 0) {
                        goto error;
                }
@@ -80,7 +79,7 @@ static int add_kctx_to_channel(struct ltt_kernel_context *kctx, struct ltt_kerne
 
        /* Ownership of kctx is transferred to the callee. */
        ret = kernel_add_channel_context(kchan, kctx);
-       kctx = NULL;
+       kctx = nullptr;
        if (ret != 0) {
                goto error;
        }
@@ -100,7 +99,7 @@ static int add_uctx_to_channel(struct ltt_ust_session *usess,
                               const struct lttng_event_context *ctx)
 {
        int ret;
-       struct ltt_ust_context *uctx = NULL;
+       struct ltt_ust_context *uctx = nullptr;
 
        LTTNG_ASSERT(usess);
        LTTNG_ASSERT(uchan);
@@ -113,7 +112,7 @@ static int add_uctx_to_channel(struct ltt_ust_session *usess,
                        goto duplicate;
                }
        }
-       uctx = NULL;
+       uctx = nullptr;
 
        switch (domain) {
        case LTTNG_DOMAIN_JUL:
@@ -154,7 +153,7 @@ static int add_uctx_to_channel(struct ltt_ust_session *usess,
 
        /* Create ltt UST context */
        uctx = trace_ust_create_context(ctx);
-       if (uctx == NULL) {
+       if (uctx == nullptr) {
                ret = LTTNG_ERR_UST_CONTEXT_INVAL;
                goto error;
        }
@@ -197,7 +196,7 @@ int context_kernel_add(struct ltt_kernel_session *ksession,
        LTTNG_ASSERT(ctx);
        LTTNG_ASSERT(channel_name);
 
-       kctx = trace_kernel_create_context(NULL);
+       kctx = trace_kernel_create_context(nullptr);
        if (!kctx) {
                ret = -LTTNG_ERR_NOMEM;
                goto error;
@@ -330,21 +329,21 @@ int context_kernel_add(struct ltt_kernel_session *ksession,
        if (*channel_name == '\0') {
                ret = add_kctx_all_channels(ksession, kctx);
                /* Ownership of kctx is transferred to the callee. */
-               kctx = NULL;
+               kctx = nullptr;
                if (ret != LTTNG_OK) {
                        goto error;
                }
        } else {
                /* Get kernel channel */
                kchan = trace_kernel_get_channel_by_name(channel_name, ksession);
-               if (kchan == NULL) {
+               if (kchan == nullptr) {
                        ret = LTTNG_ERR_KERN_CHAN_NOT_FOUND;
                        goto error;
                }
 
                ret = add_kctx_to_channel(kctx, kchan);
                /* Ownership of kctx is transferred to the callee. */
-               kctx = NULL;
+               kctx = nullptr;
                if (ret != LTTNG_OK) {
                        goto error;
                }
@@ -370,20 +369,20 @@ int context_ust_add(struct ltt_ust_session *usess,
        int ret = LTTNG_OK;
        struct lttng_ht_iter iter;
        struct lttng_ht *chan_ht;
-       struct ltt_ust_channel *uchan = NULL;
+       struct ltt_ust_channel *uchan = nullptr;
 
        LTTNG_ASSERT(usess);
        LTTNG_ASSERT(ctx);
        LTTNG_ASSERT(channel_name);
 
-       rcu_read_lock();
+       lttng::urcu::read_lock_guard read_lock;
 
        chan_ht = usess->domain_global.channels;
 
        /* Get UST channel if defined */
        if (channel_name[0] != '\0') {
                uchan = trace_ust_find_channel_by_name(chan_ht, channel_name);
-               if (uchan == NULL) {
+               if (uchan == nullptr) {
                        ret = LTTNG_ERR_UST_CHAN_NOT_FOUND;
                        goto error;
                }
@@ -393,7 +392,6 @@ int context_ust_add(struct ltt_ust_session *usess,
                /* Add ctx to channel */
                ret = add_uctx_to_channel(usess, domain, uchan, ctx);
        } else {
-               rcu_read_lock();
                /* Add ctx all events, all channels */
                cds_lfht_for_each_entry (chan_ht->ht, &iter.iter, uchan, node.node) {
                        ret = add_uctx_to_channel(usess, domain, uchan, ctx);
@@ -402,7 +400,6 @@ int context_ust_add(struct ltt_ust_session *usess,
                                continue;
                        }
                }
-               rcu_read_unlock();
        }
 
        switch (ret) {
@@ -428,6 +425,5 @@ int context_ust_add(struct ltt_ust_session *usess,
        }
 
 error:
-       rcu_read_unlock();
        return ret;
 }