Validate channel context mismatch across UST applications

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

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index d98a639af3c256f1ae4bad29d96f8b10c0a787c6..808a5dfcb31567e06e442f88ecafc92363e84b1c 100644 (file)
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -34,6 +34,8 @@
 #include "lttng-sessiond.h"
 #include "notification-thread-commands.h"
 #include "rotate.h"
+#include "event.h"
+#include "ust-field-utils.h"
 
 struct lttng_ht *ust_app_ht;
 struct lttng_ht *ust_app_ht_by_sock;
@@ -5458,7 +5460,7 @@ static int reply_ust_register_channel(int sock, int cobjd,
        if (!app) {
                DBG("Application socket %d is being torn down. Abort event notify",
                                sock);
-               ret = 0;
+               ret = -1;
                goto error_rcu_unlock;
        }
 
@@ -5493,6 +5495,9 @@ static int reply_ust_register_channel(int sock, int cobjd,
        chan_reg = ust_registry_channel_find(registry, chan_reg_key);
        assert(chan_reg);
 
+       /* Channel id is set during the object creation. */
+       chan_id = chan_reg->chan_id;
+
        if (!chan_reg->register_done) {
                /*
                 * TODO: eventually use the registry event count for
@@ -5507,9 +5512,20 @@ static int reply_ust_register_channel(int sock, int cobjd,
        } else {
                /* Get current already assigned values. */
                type = chan_reg->header_type;
+
+               /*
+                * Validate that the context fields match between
+                * registry and newcoming application.
+                */
+               if (!match_lttng_ust_ctl_field_array(chan_reg->ctx_fields,
+                               chan_reg->nr_ctx_fields,
+                               fields, nr_fields)) {
+                       ERR("Registering application channel due to context field mismatch: pid = %d, sock = %d",
+                               app->pid, app->sock);
+                       ret_code = -EINVAL;
+                       goto reply;
+               }
        }
-       /* Channel id is set during the object creation. */
-       chan_id = chan_reg->chan_id;
 
        /* Append to metadata */
        if (!chan_reg->metadata_dumped) {
@@ -5579,7 +5595,7 @@ static int add_event_ust_registry(int sock, int sobjd, int cobjd, char *name,
        if (!app) {
                DBG("Application socket %d is being torn down. Abort event notify",
                                sock);
-               ret = 0;
+               ret = -1;
                goto error_rcu_unlock;
        }
 
@@ -5685,6 +5701,7 @@ static int add_enum_ust_registry(int sock, int sobjd, char *name,
                DBG("Application socket %d is being torn down. Aborting enum registration",
                                sock);
                free(entries);
+               ret = -1;
                goto error_rcu_unlock;
        }