Fix memory copying

Change-Id: If2372335d1a06df513ad5b9f39f91adc4cdcac2f

diff --git a/ta/src/cmd_exec.c b/ta/src/cmd_exec.c
index 193dc6ed5c12ac8656e43ba3ff10a47fa327a519..0fd50dd62084fde6329ace646aac3bc6b508735b 100644 (file)
--- a/ta/src/cmd_exec.c
+++ b/ta/src/cmd_exec.c
@@ -1246,9 +1246,9 @@ TEE_Result KM_ExecCmdDeriveHybridKbkdf(TEE_Param param[4])
                goto clean;
        }
 
+       memcpy(tmp + key_in_first.data_size, key_in_second.data, key_in_second.data_size);
        key_in_first.data = tmp;
        key_in_first.data_size = new_size;
-       memcpy(key_in_first.data + key_in_first.data_size, key_in_second.data, key_in_second.data_size);
 
        // execute KBKDF
        derived_key.data = (unsigned char *) TEE_Malloc(outlen, 0);