diff --git a/services/std_svc/spm/el3_spmc/spmc_shared_mem.c b/services/std_svc/spm/el3_spmc/spmc_shared_mem.c
index 3a17827..15c7e91 100644
--- a/services/std_svc/spm/el3_spmc/spmc_shared_mem.c
+++ b/services/std_svc/spm/el3_spmc/spmc_shared_mem.c
@@ -841,6 +841,10 @@
 	header_emad_size = (size_t)((const uint8_t *)end_emad -
 				    (const uint8_t *)&obj->desc);
 
+	/*
+	 * Check that the composite descriptor
+	 * is after the endpoint descriptors.
+	 */
 	if (comp_mrd_offset < header_emad_size) {
 		WARN("%s: invalid object, offset %u < header + emad %zu\n",
 		     __func__, comp_mrd_offset, header_emad_size);
@@ -857,6 +861,7 @@
 
 	size = obj->desc_size;
 
+	/* Check that the composite descriptor is in bounds. */
 	if (comp_mrd_offset > size) {
 		WARN("%s: invalid object, offset %u > total size %zu\n",
 		     __func__, comp_mrd_offset, obj->desc_size);