X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-ctl%2Fustctl.c;fp=liblttng-ust-ctl%2Fustctl.c;h=62603a268653118ecca4cf56120db41cf4016295;hb=97001ca3c66bf902ac0f2a54367252b670ea789a;hp=d08e7edca67fa50e4feabb6d6c6d20f99521c66f;hpb=db4a4c8735164155d64c87b80e6bee0f284fa652;p=lttng-ust.git

diff --git a/liblttng-ust-ctl/ustctl.c b/liblttng-ust-ctl/ustctl.c
index d08e7edc..62603a26 100644
--- a/liblttng-ust-ctl/ustctl.c
+++ b/liblttng-ust-ctl/ustctl.c
@@ -1824,6 +1824,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;
 }