Move client-address deny test after DMA callback is cleared to avoid out-of-bounds remap

Author: jackctj117

test/wh_test_clientserver.c

@@ -351,19 +351,6 @@ static int _testDma(whServerContext* server, whClientContext* client)
     WH_TEST_ASSERT_RETURN(0 == memcmp(testMem.srvBufAllow, testMem.cliBuf,
                                       sizeof(testMem.srvBufAllow)));
 
-    /* Check that out-of-allowlist client addresses are rejected */
-    WH_TEST_ASSERT_RETURN(WH_ERROR_ACCESS == whServerDma_CopyFromClient(
-                                                  server, testMem.srvBufAllow,
-                                                  (uintptr_t)testMem.srvBufDeny,
-                                                  sizeof(testMem.srvBufAllow),
-                                                  (whServerDmaFlags){0}));
-    WH_TEST_ASSERT_RETURN(WH_ERROR_ACCESS ==
-                          whServerDma_CopyToClient(
-                              server, (uintptr_t)testMem.srvBufDeny,
-                              testMem.srvBufAllow,
-                              sizeof(testMem.srvBufAllow),
-                              (whServerDmaFlags){0}));
-
     /* Check that zero-sized copies fail, even from allowed addresses */
     WH_TEST_ASSERT_RETURN(WH_ERROR_BADARGS == whServerDma_CopyFromClient(
                                                   server, testMem.srvBufAllow,
@@ -398,6 +385,21 @@ static int _testDma(whServerContext* server, whClientContext* client)
                                       testMem.srvRemapBufAllow,
                                       sizeof(testMem.srvBufAllow)));
 
+    /* Check that out-of-allowlist client addresses are rejected (done after
+     * clearing the custom DMA callback to avoid the callback remapping the
+     * deny address out of bounds) */
+    WH_TEST_ASSERT_RETURN(WH_ERROR_ACCESS == whServerDma_CopyFromClient(
+                                                  server, testMem.srvBufAllow,
+                                                  (uintptr_t)testMem.srvBufDeny,
+                                                  sizeof(testMem.srvBufAllow),
+                                                  (whServerDmaFlags){0}));
+    WH_TEST_ASSERT_RETURN(WH_ERROR_ACCESS ==
+                          whServerDma_CopyToClient(
+                              server, (uintptr_t)testMem.srvBufDeny,
+                              testMem.srvBufAllow,
+                              sizeof(testMem.srvBufAllow),
+                              (whServerDmaFlags){0}));
+
     return rc;
 }
 #endif /* WOLFHSM_CFG_DMA && WOLFHSM_CFG_ENABLE_CLIENT && \