X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fust-registry.c;h=1990655ef638368955a52b1f705422cc606db20b;hp=80ea2e57054de736ac0801b01d4ed0bb8b0cb6a5;hb=da860cab17385f982e501d8a9f8295fe4a24f43d;hpb=bdf640139afb02572eb23f014e4a61ad68fdfeb1

diff --git a/src/bin/lttng-sessiond/ust-registry.c b/src/bin/lttng-sessiond/ust-registry.c
index 80ea2e570..1990655ef 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