X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry.c;h=dea443d94fbb1e74fc9ecffd105cb3bf1fe7b42d;hp=80ea2e57054de736ac0801b01d4ed0bb8b0cb6a5;hb=7062f070b01e86c2e29490ea41e25f1f519ceadb;hpb=10b56aefc3e1de5cee607994f64c3b8a7d85c391

diff --git a/src/bin/lttng-sessiond/ust-registry.c b/src/bin/lttng-sessiond/ust-registry.c
index 80ea2e570..dea443d94 100644
--- a/src/bin/lttng-sessiond/ust-registry.c
+++ b/src/bin/lttng-sessiond/ust-registry.c
@@ -188,12 +188,22 @@ int validate_event_field(struct ustctl_field *field,
 		const char *event_name,
 		struct ust_app *app)
 {
+	int ret = 0;
+
 	switch(field->type.atype) {
 	case ustctl_atype_integer:
 	case ustctl_atype_enum:
 	case ustctl_atype_array:
 	case ustctl_atype_sequence:
 	case ustctl_atype_string:
+	case ustctl_atype_variant:
+		break;
+	case ustctl_atype_struct:
+		if (field->type.u._struct.nr_fields != 0) {
+			WARN("Unsupported non-empty struct field.");
+			ret = -EINVAL;
+			goto end;
+		}
 		break;
 
 	case ustctl_atype_float:
@@ -205,16 +215,19 @@ int validate_event_field(struct ustctl_field *field,
 				field->type.u.basic._float.mant_dig,
 				field->name,
 				event_name);
-			return -EINVAL;
+			ret = -EINVAL;
+			goto end;
 		default:
 			break;
 		}
 		break;
 
 	default:
-		return -ENOENT;
+		ret = -ENOENT;
+		goto end;
 	}
-	return 0;
+end:
+	return ret;
 }
 
 static
@@ -847,6 +860,8 @@ int ust_registry_session_init(struct ust_registry_session **sessionp,
 	session->uid = euid;
 	session->gid = egid;
 	session->next_enum_id = 0;
+	session->major = major;
+	session->minor = minor;
 	strncpy(session->root_shm_path, root_shm_path,
 		sizeof(session->root_shm_path));
 	session->root_shm_path[sizeof(session->root_shm_path) - 1] = '\0';