X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=liblttng-ust-ctl%2Fustctl.c;h=5a7fa61fa17064be30a524a3c8dd04c28b7c1da6;hb=refs%2Fheads%2Fstable-2.7;hp=6b6f295b38bd81ff4ce3e26ad47f7ea37c351fc0;hpb=6b649e4894d06e63c9835728772198c7ffb206b3;p=lttng-ust.git

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index 6b6f295b..5a7fa61f 100644
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -1737,6 +1737,17 @@ int ustctl_recv_reg_msg(int sock,
 		return -LTTNG_UST_ERR_UNSUP_MAJOR;
 	}
 
+	/*
+	 * Addition of enumeration inside _ustclt_basic_type should have been
+	 * marked as a breaking ABI change since it blows past the included
+	 * padding hence result in bigger than expected struct. Refuse
+	 * registration for non-matching minor version since only two minor
+	 * versions exist for ust-2.7(6.0) and 2.8(6.1).
+	 */
+	if (reg_msg.minor != LTTNG_UST_ABI_MINOR_VERSION) {
+		return -LTTNG_UST_ERR_UNSUP_MAJOR;
+	}
+
 	return 0;
 }