X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-app.c;h=98c091b7a0e4c658e12e009a9273565df0a8e532;hb=28dc0326d832142a7b5fe5e31d4ebb5d8c5d745a;hp=97ce92683b8a48212ba70be7bb5ddd616b10d40c;hpb=a5c3235fa01542d36b526313b303f1f7241c5ae4;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/ust-app.c b/src/bin/lttng-sessiond/ust-app.c
index 97ce92683..98c091b7a 100644
--- a/src/bin/lttng-sessiond/ust-app.c
+++ b/src/bin/lttng-sessiond/ust-app.c
@@ -49,7 +49,7 @@
 #include "rotate.h"
 #include "event.h"
 #include "event-notifier-error-accounting.h"
-
+#include "ust-field-utils.h"
 
 struct lttng_ht *ust_app_ht;
 struct lttng_ht *ust_app_ht_by_sock;
@@ -1342,7 +1342,7 @@ static struct ust_app_event_notifier_rule *alloc_ust_app_event_notifier_rule(
 	case LTTNG_EVENT_RULE_GENERATE_EXCLUSIONS_STATUS_NONE:
 		break;
 	default:
-		/* Error occured. */
+		/* Error occurred. */
 		ERR("Failed to generate exclusions from trigger while allocating an event notifier rule");
 		goto error_put_trigger;
 	}
@@ -6386,6 +6386,9 @@ static int reply_ust_register_channel(int sock, int cobjd,
 	ust_reg_chan = ust_registry_channel_find(registry, chan_reg_key);
 	assert(ust_reg_chan);
 
+	/* Channel id is set during the object creation. */
+	chan_id = ust_reg_chan->chan_id;
+
 	if (!ust_reg_chan->register_done) {
 		/*
 		 * TODO: eventually use the registry event count for
@@ -6400,9 +6403,19 @@ static int reply_ust_register_channel(int sock, int cobjd,
 	} else {
 		/* Get current already assigned values. */
 		type = ust_reg_chan->header_type;
+		/*
+		 * Validate that the context fields match between
+		 * registry and newcoming application.
+		 */
+		if (!match_lttng_ust_ctl_field_array(ust_reg_chan->ctx_fields,
+				ust_reg_chan->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 = ust_reg_chan->chan_id;
 
 	/* Append to metadata */
 	if (!ust_reg_chan->metadata_dumped) {