commit ac3c20013cba08babf891fa6616d25cdf7df5c7c
author Paul Elliott <paul.elliott@arm.com> Tue Apr 27 19:10:18 2021 +0100
committer Paul Elliott <paul.elliott@arm.com> Fri May 14 19:03:26 2021 +0100
tree 972ff2aa91b5a10c44630a41c0255a80504b96be
parent d4e99ed40cd8a043daa8a62cec96ad58e3167570

Prevent unsafe memcpy

Some tests cause a zero length input or output, which can mean the
allocated test output buffers can be zero length. Protect against
calling memcpy blindly in these situations.

Signed-off-by: Paul Elliott <paul.elliott@arm.com>

tests/suites/test_suite_psa_crypto.function

diff --git a/tests/suites/test_suite_psa_crypto.function b/tests/suites/test_suite_psa_crypto.function
index 991b10a..a7ba675 100644
--- a/tests/suites/test_suite_psa_crypto.function
+++ b/tests/suites/test_suite_psa_crypto.function
@@ -3292,7 +3292,10 @@
                                          part_length, part_data,
                                          part_data_size, &output_part_length ) );
 
-            memcpy( ( output_data + part_offset ), part_data, output_part_length );
+            if( output_data && output_part_length )
+            {
+                memcpy( ( output_data + part_offset ), part_data, output_part_length );
+            }
 
             part_offset += part_length;
             output_length += output_part_length;
@@ -3312,13 +3315,19 @@
                                  tag_buffer, tag_length,
                                  &tag_size ) );
 
-    memcpy( ( output_data + output_length ), final_data, output_part_length );
+    if( output_data && output_part_length )
+    {
+        memcpy( ( output_data + output_length ), final_data, output_part_length );
+    }
 
     TEST_EQUAL(tag_length, tag_size);
 
     output_length += output_part_length;
 
-    memcpy( ( output_data + output_length ), tag_buffer, tag_length );
+    if( output_data && tag_length )
+    {
+        memcpy( ( output_data + output_length ), tag_buffer, tag_length );
+    }
 
     output_length += tag_length;
 
@@ -3516,7 +3525,10 @@
                 goto exit;
             }
 
-            memcpy( ( output_data + part_offset ), part_data, output_part_length );
+            if( output_data && output_part_length )
+            {
+                memcpy( ( output_data + part_offset ), part_data, output_part_length );
+            }
 
             part_offset += part_length;
             output_length += output_part_length;
@@ -3547,7 +3559,10 @@
         goto exit;
     }
 
-    memcpy( ( output_data + output_length ), final_data, output_part_length );
+    if( output_data &&output_part_length )
+    {
+        memcpy( ( output_data + output_length ), final_data, output_part_length );
+    }
 
     output_length += output_part_length;
 
@@ -3666,7 +3681,10 @@
                                              part_length, part_data,
                                              part_data_size, &output_part_length ) );
 
-                memcpy( ( output_data2 + part_offset ), part_data, output_part_length );
+                if( output_data2 && output_part_length )
+                {
+                    memcpy( ( output_data2 + part_offset ), part_data, output_part_length );
+                }
 
                 part_offset += part_length;
                 output_length2 += output_part_length;
@@ -3684,7 +3702,10 @@
                                      &output_part_length,
                                      tag_buffer, tag_length ) );
 
-        memcpy( ( output_data2 + output_length2 ), final_data, output_part_length);
+        if( output_data2 && output_part_length )
+        {
+            memcpy( ( output_data2 + output_length2 ), final_data, output_part_length);
+        }
 
         output_length2 += output_part_length;
 
@@ -3872,7 +3893,10 @@
                 goto exit;
             }
 
-            memcpy( ( output_data + part_offset ), part_data, output_part_length );
+            if( output_data && output_part_length )
+            {
+                memcpy( ( output_data + part_offset ), part_data, output_part_length );
+            }
 
             part_offset += part_length;
             output_length += output_part_length;
@@ -3903,7 +3927,10 @@
         goto exit;
     }
 
-    memcpy( ( output_data + output_length ), final_data, output_part_length );
+    if( output_data && output_part_length )
+    {
+        memcpy( ( output_data + output_length ), final_data, output_part_length );
+    }
 
     output_length += output_part_length;