Fix CI: register DMA allow lists in tests and remove erroneous server-side allow list check in CopyFromClient/CopyToClient

Author: jackctj117

src/wh_server_dma.c

@@ -131,15 +131,7 @@ int whServerDma_CopyFromClient(struct whServerContext_t* server,
         return WH_ERROR_BADARGS;
     }
 
-    /* Check the server address against the allow list */
-    rc = wh_Dma_CheckMemOperAgainstAllowList(server->dma.dmaAddrAllowList,
-                                             WH_DMA_OPER_CLIENT_READ_PRE,
-                                             serverPtr, len);
-    if (rc != WH_ERROR_OK) {
-        return rc;
-    }
-
-    /* Process the client address pre-read */
+    /* Process the client address pre-read (includes allow list check) */
     rc = wh_Server_DmaProcessClientAddress(
         server, clientAddr, &transformedAddr, len, WH_DMA_OPER_CLIENT_READ_PRE,
         flags);
@@ -185,15 +177,7 @@ int whServerDma_CopyToClient(struct whServerContext_t* server,
         return WH_ERROR_BADARGS;
     }
 
-    /* Check the server address against the allow list */
-    rc = wh_Dma_CheckMemOperAgainstAllowList(server->dma.dmaAddrAllowList,
-                                             WH_DMA_OPER_CLIENT_WRITE_PRE,
-                                             serverPtr, len);
-    if (rc != WH_ERROR_OK) {
-        return rc;
-    }
-
-    /* Process the client address pre-write */
+    /* Process the client address pre-write (includes allow list check) */
     rc = wh_Server_DmaProcessClientAddress(server, clientAddr, &transformedAddr,
                                            len, WH_DMA_OPER_CLIENT_WRITE_PRE,
                                            flags);

test/wh_test_clientserver.c

@@ -972,16 +972,28 @@ int whTest_ClientServerSequential(whTestNvmBackendType nvmType)
     WH_TEST_ASSERT_RETURN(avail_objects == WOLFHSM_CFG_NVM_OBJECT_COUNT);
 
 #ifdef WOLFHSM_CFG_DMA
+    {
+        /* Register DMA allow list for the buffers used in DMA NVM tests.
+         * meta is declared here so its address is stable for the allow list */
+        whNvmMetadata meta = {0};
+        whServerDmaAddrAllowList nvm_dma_allow = {0};
+        nvm_dma_allow.readList[0].addr  = send_buffer;
+        nvm_dma_allow.readList[0].size  = sizeof(send_buffer);
+        nvm_dma_allow.readList[1].addr  = &meta;
+        nvm_dma_allow.readList[1].size  = sizeof(meta);
+        nvm_dma_allow.writeList[0].addr = recv_buffer;
+        nvm_dma_allow.writeList[0].size = sizeof(recv_buffer);
+        WH_TEST_RETURN_ON_FAIL(
+            wh_Server_DmaRegisterAllowList(server, &nvm_dma_allow));
+
     /* Same writeback test, but with DMA */
     for (counter = 0; counter < 5; counter++) {
-        whNvmMetadata meta = {
-            .id     = counter + 40,
-            .access = WH_NVM_ACCESS_ANY,
-            .flags  = WH_NVM_FLAGS_NONE,
-            .len    = 0,
-            .label  = {0},
-        };
         whNvmSize len = 0;
+        meta.id     = counter + 40;
+        meta.access = WH_NVM_ACCESS_ANY;
+        meta.flags  = WH_NVM_FLAGS_NONE;
+        meta.len    = 0;
+        memset(meta.label, 0, sizeof(meta.label));
 
         whNvmId     gid                         = 0;
         whNvmAccess gaccess                     = 0;
@@ -1121,6 +1133,7 @@ int whTest_ClientServerSequential(whTestNvmBackendType nvmType)
     WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);
     WH_TEST_ASSERT_RETURN(avail_objects == WOLFHSM_CFG_NVM_OBJECT_COUNT);
 
+    } /* DMA allow list scope */
 #endif /* WOLFHSM_CFG_DMA */
 
     /* Test custom registered callbacks */
@@ -1350,16 +1363,28 @@ int whTest_ClientServerClientConfig(whClientConfig* clientCfg)
     WH_TEST_ASSERT_RETURN(avail_objects == WOLFHSM_CFG_NVM_OBJECT_COUNT);
 
 #ifdef WOLFHSM_CFG_DMA
+    {
+        /* Register DMA allow list for the buffers used in DMA NVM tests.
+         * meta is declared here so its address is stable for the allow list */
+        whNvmMetadata meta = {0};
+        whServerDmaAddrAllowList nvm_dma_allow = {0};
+        nvm_dma_allow.readList[0].addr  = send_buffer;
+        nvm_dma_allow.readList[0].size  = sizeof(send_buffer);
+        nvm_dma_allow.readList[1].addr  = &meta;
+        nvm_dma_allow.readList[1].size  = sizeof(meta);
+        nvm_dma_allow.writeList[0].addr = recv_buffer;
+        nvm_dma_allow.writeList[0].size = sizeof(recv_buffer);
+        WH_TEST_RETURN_ON_FAIL(
+            wh_Server_DmaRegisterAllowList(server, &nvm_dma_allow));
+
     /* Same writeback test, but with DMA */
     for (counter = 0; counter < 5; counter++) {
-        whNvmMetadata meta = {
-            .id     = counter + 40,
-            .access = WH_NVM_ACCESS_ANY,
-            .flags  = WH_NVM_FLAGS_NONE,
-            .len    = 0,
-            .label  = {0},
-        };
         whNvmSize len = 0;
+        meta.id     = counter + 40;
+        meta.access = WH_NVM_ACCESS_ANY;
+        meta.flags  = WH_NVM_FLAGS_NONE;
+        meta.len    = 0;
+        memset(meta.label, 0, sizeof(meta.label));
 
         whNvmId     gid                         = 0;
         whNvmAccess gaccess                     = 0;
@@ -1464,6 +1489,7 @@ int whTest_ClientServerClientConfig(whClientConfig* clientCfg)
     WH_TEST_ASSERT_RETURN(server_rc == WH_ERROR_OK);
     WH_TEST_ASSERT_RETURN(avail_objects == WOLFHSM_CFG_NVM_OBJECT_COUNT);
 
+    } /* DMA allow list scope */
 #endif /* WOLFHSM_CFG_DMA */
 
     /* Test client counter API */