fix alignment issue for MCTP transport, to match test transport.

Signed-off-by: Jiewen Yao <[email protected]>
DMTF · Apr 2, 2024 · a2e2354 · a2e2354
1 parent 269e738
commit a2e2354
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 6 deletions.
diff --git a/library/spdm_transport_mctp_lib/libspdm_mctp_common.c b/library/spdm_transport_mctp_lib/libspdm_mctp_common.c
@@ -22,7 +22,9 @@
  * @retval RETURN_SUCCESS               The message is encoded successfully.
  * @retval RETURN_INVALID_PARAMETER     The message is NULL or the message_size is zero.
  **/
-libspdm_return_t libspdm_mctp_encode_message(const uint32_t *session_id, size_t message_size,
+libspdm_return_t libspdm_mctp_encode_message(const uint32_t *session_id,
+                                             bool need_alignment,
+                                             size_t message_size,
                                              void *message,
                                              size_t *transport_message_size,
                                              void **transport_message);
@@ -118,7 +120,7 @@ libspdm_return_t libspdm_transport_mctp_encode_message(
             /* SPDM message to APP message*/
             app_message = NULL;
             app_message_size = app_trans_header_size + message_size;
-            status = libspdm_mctp_encode_message(NULL, message_size,
+            status = libspdm_mctp_encode_message(NULL, false, message_size,
                                                  message,
                                                  &app_message_size,
                                                  &app_message);
@@ -148,7 +150,7 @@ libspdm_return_t libspdm_transport_mctp_encode_message(
 
         /* secured message to secured MCTP message*/
         status = libspdm_mctp_encode_message(
-            session_id, secured_message_size, secured_message,
+            session_id, true, secured_message_size, secured_message,
             transport_message_size, transport_message);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {
             LIBSPDM_DEBUG((LIBSPDM_DEBUG_ERROR, "transport_encode_message - %xu\n",
@@ -157,7 +159,7 @@ libspdm_return_t libspdm_transport_mctp_encode_message(
         }
     } else {
         /* SPDM message to normal MCTP message*/
-        status = libspdm_mctp_encode_message(NULL, message_size, message,
+        status = libspdm_mctp_encode_message(NULL, true, message_size, message,
                                              transport_message_size,
                                              transport_message);
         if (LIBSPDM_STATUS_IS_ERROR(status)) {

diff --git a/library/spdm_transport_mctp_lib/libspdm_mctp_mctp.c b/library/spdm_transport_mctp_lib/libspdm_mctp_mctp.c
@@ -74,7 +74,9 @@ spdm_version_number_t libspdm_mctp_get_secured_spdm_version(
  * @retval RETURN_SUCCESS               The message is encoded successfully.
  * @retval RETURN_INVALID_PARAMETER     The message is NULL or the message_size is zero.
  **/
-libspdm_return_t libspdm_mctp_encode_message(const uint32_t *session_id, size_t message_size,
+libspdm_return_t libspdm_mctp_encode_message(const uint32_t *session_id,
+                                             bool need_alignment,
+                                             size_t message_size,
                                              void *message,
                                              size_t *transport_message_size,
                                              void **transport_message)
@@ -84,7 +86,11 @@ libspdm_return_t libspdm_mctp_encode_message(const uint32_t *session_id, size_t
     uint32_t data32;
     mctp_message_header_t *mctp_message_header;
 
-    alignment = LIBSPDM_MCTP_ALIGNMENT;
+    if (need_alignment) {
+        alignment = LIBSPDM_MCTP_ALIGNMENT;
+    } else {
+        alignment = 1;
+    }
     aligned_message_size =
         (message_size + (alignment - 1)) & ~(alignment - 1);