xtest: Explicitly initialize local variables
This change initializes all local variables to prevent build issues
(warnings and/or errors) in OP-TEE test package. This change uses
= { } for non-scalar variables and = 0 for scalar variables when there
is no obvious value. This change falls back to memset() only when
neither = { } nor = 0 is applicable, here pthread_t typed variable
and variable size arrays.
Signed-off-by: Etienne Carriere <etienne.carriere@linaro.org>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
diff --git a/host/xtest/regression_6000.c b/host/xtest/regression_6000.c
index 010018c..e49af86 100644
--- a/host/xtest/regression_6000.c
+++ b/host/xtest/regression_6000.c
@@ -113,8 +113,8 @@
uint32_t flags, uint32_t *obj, uint32_t storage_id)
{
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- TEEC_Result res;
- uint32_t org;
+ TEEC_Result res = TEEC_ERROR_GENERIC;
+ uint32_t org = 0;
op.params[0].tmpref.buffer = id;
op.params[0].tmpref.size = id_size;
@@ -140,8 +140,8 @@
uint32_t storage_id)
{
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- TEEC_Result res;
- uint32_t org;
+ TEEC_Result res = TEEC_ERROR_GENERIC;
+ uint32_t org = 0;
op.params[0].tmpref.buffer = id;
op.params[0].tmpref.size = id_size;
@@ -168,8 +168,8 @@
uint32_t id_size, uint32_t storage_id)
{
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- TEEC_Result res;
- uint32_t org;
+ TEEC_Result res = TEEC_ERROR_GENERIC;
+ uint32_t org = 0;
op.params[0].tmpref.buffer = id;
op.params[0].tmpref.size = id_size;
@@ -187,7 +187,7 @@
static TEEC_Result fs_close(TEEC_Session *sess, uint32_t obj)
{
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- uint32_t org;
+ uint32_t org = 0;
op.params[0].value.a = obj;
@@ -200,9 +200,9 @@
static TEEC_Result fs_read(TEEC_Session *sess, uint32_t obj, void *data,
uint32_t data_size, uint32_t *count)
{
- TEEC_Result res;
+ TEEC_Result res = TEEC_ERROR_GENERIC;
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- uint32_t org;
+ uint32_t org = 0;
op.params[0].tmpref.buffer = data;
op.params[0].tmpref.size = data_size;
@@ -225,7 +225,7 @@
uint32_t data_size)
{
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- uint32_t org;
+ uint32_t org = 0;
op.params[0].tmpref.buffer = data;
op.params[0].tmpref.size = data_size;
@@ -243,7 +243,7 @@
int32_t whence)
{
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- uint32_t org;
+ uint32_t org = 0;
op.params[0].value.a = obj;
op.params[0].value.b = *(uint32_t *)&offset;
@@ -258,7 +258,7 @@
static TEEC_Result fs_unlink(TEEC_Session *sess, uint32_t obj)
{
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- uint32_t org;
+ uint32_t org = 0;
op.params[0].value.a = obj;
@@ -271,7 +271,7 @@
static TEEC_Result fs_trunc(TEEC_Session *sess, uint32_t obj, uint32_t len)
{
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- uint32_t org;
+ uint32_t org = 0;
op.params[0].value.a = obj;
op.params[0].value.b = len;
@@ -286,7 +286,7 @@
uint32_t id_size)
{
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- uint32_t org;
+ uint32_t org = 0;
op.params[0].value.a = obj;
op.params[1].tmpref.buffer = id;
@@ -301,9 +301,9 @@
static TEEC_Result fs_alloc_enum(TEEC_Session *sess, uint32_t *e)
{
- TEEC_Result res;
+ TEEC_Result res = TEEC_ERROR_GENERIC;
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- uint32_t org;
+ uint32_t org = 0;
op.paramTypes = TEEC_PARAM_TYPES(TEEC_VALUE_OUTPUT, TEEC_NONE,
TEEC_NONE, TEEC_NONE);
@@ -318,9 +318,9 @@
static TEEC_Result fs_reset_enum(TEEC_Session *sess, uint32_t e)
{
- TEEC_Result res;
+ TEEC_Result res = TEEC_ERROR_GENERIC;
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- uint32_t org;
+ uint32_t org = 0;
op.paramTypes = TEEC_PARAM_TYPES(TEEC_VALUE_INPUT, TEEC_NONE,
TEEC_NONE, TEEC_NONE);
@@ -334,7 +334,7 @@
static TEEC_Result fs_free_enum(TEEC_Session *sess, uint32_t e)
{
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- uint32_t org;
+ uint32_t org = 0;
op.paramTypes = TEEC_PARAM_TYPES(TEEC_VALUE_INPUT, TEEC_NONE, TEEC_NONE,
TEEC_NONE);
@@ -348,7 +348,7 @@
uint32_t storage_id)
{
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- uint32_t org;
+ uint32_t org = 0;
op.paramTypes = TEEC_PARAM_TYPES(TEEC_VALUE_INPUT, TEEC_NONE,
TEEC_NONE, TEEC_NONE);
@@ -363,7 +363,7 @@
size_t info_size, void *id, uint32_t id_size)
{
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- uint32_t org;
+ uint32_t org = 0;
op.paramTypes = TEEC_PARAM_TYPES(TEEC_VALUE_INPUT, TEEC_NONE,
TEEC_MEMREF_TEMP_OUTPUT, TEEC_NONE);
@@ -383,7 +383,7 @@
uint32_t obj_usage)
{
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- uint32_t org;
+ uint32_t org = 0;
op.params[0].value.a = obj;
op.params[0].value.b = obj_usage;
@@ -398,9 +398,9 @@
static TEEC_Result fs_alloc_obj(TEEC_Session *sess, uint32_t obj_type,
uint32_t max_key_size, uint32_t *obj)
{
- TEEC_Result res;
+ TEEC_Result res = TEEC_ERROR_GENERIC;
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- uint32_t org;
+ uint32_t org = 0;
op.params[0].value.a = obj_type;
op.params[0].value.b = max_key_size;
@@ -416,7 +416,7 @@
static TEEC_Result fs_free_obj(TEEC_Session *sess, uint32_t obj)
{
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- uint32_t org;
+ uint32_t org = 0;
op.params[0].value.a = obj;
@@ -429,7 +429,7 @@
static TEEC_Result fs_reset_obj(TEEC_Session *sess, uint32_t obj)
{
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- uint32_t org;
+ uint32_t org = 0;
op.params[0].value.a = obj;
@@ -443,7 +443,7 @@
void *obj_info, size_t info_size)
{
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- uint32_t org;
+ uint32_t org = 0;
op.paramTypes = TEEC_PARAM_TYPES(TEEC_VALUE_INPUT,
TEEC_MEMREF_TEMP_OUTPUT,
@@ -459,11 +459,11 @@
/* trunc */
static void test_truncate_file_length(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Session sess;
+ TEEC_Session sess = { };
uint32_t obj = 0;
- uint8_t out[10] = { 0 };
+ uint8_t out[10] = { };
uint32_t count = 0;
- uint32_t orig;
+ uint32_t orig = 0;
if (!ADBG_EXPECT_TEEC_SUCCESS(c,
xtest_teec_open_session(&sess, &storage_ta_uuid, NULL, &orig)))
@@ -499,7 +499,7 @@
goto exit;
/* open */
- if (!ADBG_EXPECT_TEEC_SUCCESS(c, fs_open(&sess, file_01, sizeof(file_01),
+ if (!ADBG_EXPECT_TEEC_SUCCESS(c, fs_open(&sess, file_01, sizeof(file_01),
TEE_DATA_FLAG_ACCESS_WRITE |
TEE_DATA_FLAG_ACCESS_READ |
TEE_DATA_FLAG_ACCESS_WRITE_META, &obj, storage_id)))
@@ -528,12 +528,12 @@
/* extend */
static void test_extend_file_length(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Session sess;
+ TEEC_Session sess = { };
uint32_t obj = 0;
- uint8_t out[10] = { 0 };
- uint8_t expect[10] = { 0 };
+ uint8_t out[10] = { };
+ uint8_t expect[10] = { };
uint32_t count = 0;
- uint32_t orig;
+ uint32_t orig = 0;
if (!ADBG_EXPECT_TEEC_SUCCESS(c,
xtest_teec_open_session(&sess, &storage_ta_uuid, NULL, &orig)))
@@ -571,7 +571,7 @@
goto exit;
/* open */
- if (!ADBG_EXPECT_TEEC_SUCCESS(c, fs_open(&sess, file_01, sizeof(file_01),
+ if (!ADBG_EXPECT_TEEC_SUCCESS(c, fs_open(&sess, file_01, sizeof(file_01),
TEE_DATA_FLAG_ACCESS_WRITE |
TEE_DATA_FLAG_ACCESS_READ |
TEE_DATA_FLAG_ACCESS_WRITE_META, &obj, storage_id)))
@@ -602,12 +602,12 @@
/* file hole */
static void test_file_hole(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Session sess;
+ TEEC_Session sess = { };
uint32_t obj = 0;
- uint8_t out[10] = { 0 };
- uint8_t expect[10] = { 0 };
+ uint8_t out[10] = { };
+ uint8_t expect[10] = { };
uint32_t count = 0;
- uint32_t orig;
+ uint32_t orig = 0;
if (!ADBG_EXPECT_TEEC_SUCCESS(c,
xtest_teec_open_session(&sess, &storage_ta_uuid, NULL, &orig)))
@@ -653,7 +653,7 @@
goto exit;
/* open */
- if (!ADBG_EXPECT_TEEC_SUCCESS(c, fs_open(&sess, file_01, sizeof(file_01),
+ if (!ADBG_EXPECT_TEEC_SUCCESS(c, fs_open(&sess, file_01, sizeof(file_01),
TEE_DATA_FLAG_ACCESS_WRITE |
TEE_DATA_FLAG_ACCESS_READ |
TEE_DATA_FLAG_ACCESS_WRITE_META, &obj, storage_id)))
@@ -686,38 +686,38 @@
#ifdef WITH_GP_TESTS
static TEEC_Result ds_seek_obj_inv_handle(TEEC_Session *sess)
{
- TEEC_Operation op;
- uint32_t org;
+ TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
+ uint32_t org = 0;
- op.paramTypes = TEEC_PARAM_TYPES(
- TEEC_VALUE_INPUT, TEEC_NONE, TEEC_NONE, TEEC_NONE);
+ op.paramTypes = TEEC_PARAM_TYPES(
+ TEEC_VALUE_INPUT, TEEC_NONE, TEEC_NONE, TEEC_NONE);
- op.params[0].value.a = CASE_DATA_OBJECT_NOT_PERSISTENT;
+ op.params[0].value.a = CASE_DATA_OBJECT_NOT_PERSISTENT;
- return TEEC_InvokeCommand(
- sess, CMD_SeekObjectData_panic, &op, &org);
+ return TEEC_InvokeCommand(
+ sess, CMD_SeekObjectData_panic, &op, &org);
}
static TEEC_Result ds_seek_gp(
- TEEC_Session *sess, TEE_Whence wh, uint32_t wh_off, uint32_t set_off,
- void *in, size_t in_size, void *out, size_t out_size)
+ TEEC_Session *sess, TEE_Whence wh, uint32_t wh_off, uint32_t set_off,
+ void *in, size_t in_size, void *out, size_t out_size)
{
- TEEC_Operation op;
- uint32_t org;
+ TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
+ uint32_t org = 0;
- op.paramTypes = TEEC_PARAM_TYPES(
- TEEC_VALUE_INPUT, TEEC_VALUE_INPUT, TEEC_MEMREF_TEMP_INPUT,
- TEEC_MEMREF_TEMP_OUTPUT);
+ op.paramTypes = TEEC_PARAM_TYPES(
+ TEEC_VALUE_INPUT, TEEC_VALUE_INPUT, TEEC_MEMREF_TEMP_INPUT,
+ TEEC_MEMREF_TEMP_OUTPUT);
- op.params[0].value.a = wh;
- op.params[0].value.b = wh_off;
- op.params[1].value.a = set_off;
- op.params[2].tmpref.buffer = in;
- op.params[2].tmpref.size = in_size;
- op.params[3].tmpref.buffer = out;
- op.params[3].tmpref.size = out_size;
+ op.params[0].value.a = wh;
+ op.params[0].value.b = wh_off;
+ op.params[1].value.a = set_off;
+ op.params[2].tmpref.buffer = in;
+ op.params[2].tmpref.size = in_size;
+ op.params[3].tmpref.buffer = out;
+ op.params[3].tmpref.size = out_size;
- return TEEC_InvokeCommand(sess, CMD_SeekWriteReadObjectData, &op, &org);
+ return TEEC_InvokeCommand(sess, CMD_SeekWriteReadObjectData, &op, &org);
}
static TEEC_Result ds_init_object_and_attributes(TEEC_Session *sess,
@@ -725,88 +725,89 @@
size_t attr_meta_len, const void *attr_data, size_t attr_data_len,
uint32_t option)
{
- TEEC_Operation op;
- uint32_t org;
+ TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
+ uint32_t org = 0;
- op.paramTypes = TEEC_PARAM_TYPES(
- TEEC_VALUE_INPUT, TEEC_MEMREF_TEMP_INPUT,
- TEEC_MEMREF_TEMP_INPUT, TEEC_VALUE_INPUT);
+ op.paramTypes = TEEC_PARAM_TYPES(
+ TEEC_VALUE_INPUT, TEEC_MEMREF_TEMP_INPUT,
+ TEEC_MEMREF_TEMP_INPUT, TEEC_VALUE_INPUT);
- op.params[0].value.a = obj_type;
- op.params[0].value.b = obj_size;
- op.params[1].tmpref.buffer = (void *)attr_meta;
- op.params[1].tmpref.size = attr_meta_len;
- op.params[2].tmpref.buffer = (void *)attr_data;
- op.params[2].tmpref.size = attr_data_len;
- op.params[3].value.a = option;
+ op.params[0].value.a = obj_type;
+ op.params[0].value.b = obj_size;
+ op.params[1].tmpref.buffer = (void *)attr_meta;
+ op.params[1].tmpref.size = attr_meta_len;
+ op.params[2].tmpref.buffer = (void *)attr_data;
+ op.params[2].tmpref.size = attr_data_len;
+ op.params[3].value.a = option;
- return TEEC_InvokeCommand(sess, CMD_InitObjectAndAttributes, &op, &org);
+ return TEEC_InvokeCommand(sess, CMD_InitObjectAndAttributes, &op, &org);
}
static TEEC_Result ds_rename_access_conflict(TEEC_Session *sess)
{
- TEEC_Operation op;
- uint32_t org;
+ TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
+ uint32_t org = 0;
- op.paramTypes = TEEC_PARAM_TYPES(
- TEEC_NONE, TEEC_NONE, TEEC_NONE, TEEC_NONE);
+ op.paramTypes = TEEC_PARAM_TYPES(
+ TEEC_NONE, TEEC_NONE, TEEC_NONE, TEEC_NONE);
- return TEEC_InvokeCommand(
- sess, CMD_RenamePersistentObject_AccessConflict, &op, &org);
+ return TEEC_InvokeCommand(
+ sess, CMD_RenamePersistentObject_AccessConflict, &op, &org);
}
static TEEC_Result ds_start_enum_no_item(TEEC_Session *sess)
{
- TEEC_Operation op;
- uint32_t org;
- TEEC_Result res;
+ TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
+ uint32_t org = 0;
+ TEEC_Result res = TEEC_ERROR_GENERIC;
- op.paramTypes = TEEC_PARAM_TYPES(
- TEEC_VALUE_OUTPUT, TEEC_NONE, TEEC_NONE, TEEC_NONE);
+ op.paramTypes = TEEC_PARAM_TYPES(
+ TEEC_VALUE_OUTPUT, TEEC_NONE, TEEC_NONE, TEEC_NONE);
- res = TEEC_InvokeCommand(
- sess, CMD_StartNGetPersistentObjectEnumerator_itemNotFound, &op, &org);
+ res = TEEC_InvokeCommand(
+ sess, CMD_StartNGetPersistentObjectEnumerator_itemNotFound,
+ &op, &org);
- if (res != TEEC_SUCCESS)
- return res;
+ if (res != TEEC_SUCCESS)
+ return res;
- if (op.params[0].value.a != 0 || op.params[0].value.b != 0)
- return TEEC_ERROR_GENERIC;
+ if (op.params[0].value.a != 0 || op.params[0].value.b != 0)
+ return TEEC_ERROR_GENERIC;
- return res;
+ return res;
}
static TEEC_Result ds_rename_success(TEEC_Session *sess)
{
- TEEC_Operation op;
- uint32_t org;
+ TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
+ uint32_t org = 0;
- op.paramTypes = TEEC_PARAM_TYPES(
- TEEC_NONE, TEEC_NONE, TEEC_NONE, TEEC_NONE);
+ op.paramTypes = TEEC_PARAM_TYPES(
+ TEEC_NONE, TEEC_NONE, TEEC_NONE, TEEC_NONE);
- return TEEC_InvokeCommand(
- sess, CMD_RenamePersistentObject_Success, &op, &org);
+ return TEEC_InvokeCommand(
+ sess, CMD_RenamePersistentObject_Success, &op, &org);
}
static TEEC_Result ds_null_close_free_reset(TEEC_Session *sess)
{
- TEEC_Operation op;
- uint32_t org;
+ TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
+ uint32_t org = 0;
- op.paramTypes = TEEC_PARAM_TYPES(
- TEEC_NONE, TEEC_NONE, TEEC_NONE, TEEC_NONE);
+ op.paramTypes = TEEC_PARAM_TYPES(
+ TEEC_NONE, TEEC_NONE, TEEC_NONE, TEEC_NONE);
- return TEEC_InvokeCommand(
- sess, CMD_CloseFreeAndResetObjectSuccessHandleNull, &op, &org);
+ return TEEC_InvokeCommand(
+ sess, CMD_CloseFreeAndResetObjectSuccessHandleNull, &op, &org);
}
#endif
/* create */
static void xtest_tee_test_6001_single(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Session sess;
+ TEEC_Session sess = { };
uint32_t obj = 0;
- uint32_t orig;
+ uint32_t orig = 0;
if (!ADBG_EXPECT_TEEC_SUCCESS(c,
xtest_teec_open_session(&sess, &storage_ta_uuid, NULL, &orig)))
@@ -833,9 +834,9 @@
/* open */
static void xtest_tee_test_6002_single(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Session sess;
+ TEEC_Session sess = { };
uint32_t obj = 0;
- uint32_t orig;
+ uint32_t orig = 0;
if (!ADBG_EXPECT_TEEC_SUCCESS(c,
xtest_teec_open_session(&sess, &storage_ta_uuid, NULL, &orig)))
@@ -877,11 +878,11 @@
/* read */
static void xtest_tee_test_6003_single(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Session sess;
+ TEEC_Session sess = { };
uint32_t obj = 0;
- uint8_t out[10] = { 0 };
+ uint8_t out[10] = { };
uint32_t count = 0;
- uint32_t orig;
+ uint32_t orig = 0;
if (!ADBG_EXPECT_TEEC_SUCCESS(c,
xtest_teec_open_session(&sess, &storage_ta_uuid, NULL, &orig)))
@@ -921,11 +922,11 @@
/* write */
static void xtest_tee_test_6004_single(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Session sess;
+ TEEC_Session sess = { };
uint32_t obj = 0;
- uint8_t out[10] = { 0 };
+ uint8_t out[10] = { };
uint32_t count = 0;
- uint32_t orig;
+ uint32_t orig = 0;
if (!ADBG_EXPECT_TEEC_SUCCESS(c,
xtest_teec_open_session(&sess, &storage_ta_uuid, NULL, &orig)))
@@ -980,11 +981,11 @@
/* seek */
static void xtest_tee_test_6005_single(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Session sess;
+ TEEC_Session sess = { };
uint32_t obj = 0;
- uint8_t out[10] = { 0 };
+ uint8_t out[10] = { };
uint32_t count = 0;
- uint32_t orig;
+ uint32_t orig = 0;
if (!ADBG_EXPECT_TEEC_SUCCESS(c,
xtest_teec_open_session(&sess, &storage_ta_uuid, NULL, &orig)))
@@ -1024,9 +1025,9 @@
/* unlink */
static void xtest_tee_test_6006_single(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Session sess;
+ TEEC_Session sess = { };
uint32_t obj = 0;
- uint32_t orig;
+ uint32_t orig = 0;
if (!ADBG_EXPECT_TEEC_SUCCESS(c,
xtest_teec_open_session(&sess, &storage_ta_uuid, NULL, &orig)))
@@ -1076,11 +1077,11 @@
static void xtest_tee_test_6008_single(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Session sess;
+ TEEC_Session sess = { };
uint32_t obj = 0;
- uint8_t out[10] = { 0 };
+ uint8_t out[10] = { };
uint32_t count = 0;
- uint32_t orig;
+ uint32_t orig = 0;
if (!ADBG_EXPECT_TEEC_SUCCESS(c,
xtest_teec_open_session(&sess, &storage_ta_uuid, NULL, &orig)))
@@ -1141,14 +1142,14 @@
static void xtest_tee_test_6009_single(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Session sess;
- uint32_t obj0;
- uint32_t obj1;
- uint32_t obj2;
+ TEEC_Session sess = { };
+ uint32_t obj0 = 0;
+ uint32_t obj1 = 0;
+ uint32_t obj2 = 0;
uint32_t e = 0;
- uint8_t info[200];
- uint8_t id[200];
- uint32_t orig;
+ uint8_t info[200] = { };
+ uint8_t id[200] = { };
+ uint32_t orig = 0;
if (!ADBG_EXPECT_TEEC_SUCCESS(c,
xtest_teec_open_session(&sess, &storage_ta_uuid, NULL, &orig)))
@@ -1248,15 +1249,15 @@
static void xtest_tee_test_6010_single(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Session sess;
- uint32_t orig;
- uint32_t o1;
- uint32_t o2;
- uint32_t e;
- uint32_t f;
- uint8_t data[1024];
- uint8_t out[1024];
- uint32_t n;
+ TEEC_Session sess = { };
+ uint32_t orig = 0;
+ uint32_t o1 = 0;
+ uint32_t o2 = 0;
+ uint32_t e = 0;
+ uint32_t f = 0;
+ uint8_t data[1024] = { };
+ uint8_t out[1024] = { };
+ uint32_t n = 0;
for (n = 0; n < ARRAY_SIZE(data); n++)
data[n] = n;
@@ -1477,37 +1478,38 @@
#ifdef WITH_GP_TESTS
static void xtest_tee_test_6011(ADBG_Case_t *c)
{
- TEEC_Session sess;
- uint32_t orig;
- /*
- * Test data from
- * Invoke_InitObjectAndAttributes_TEE_TYPE_AES_success_attribute_
- * TEE_ATTR_SECRET_VALUE_correct_size (9d-9a-91)
- */
- static const uint8_t attr_meta[] = {
+ TEEC_Session sess = { };
+ uint32_t orig = 0;
+ /*
+ * Test data from
+ * Invoke_InitObjectAndAttributes_TEE_TYPE_AES_success_attribute_
+ * TEE_ATTR_SECRET_VALUE_correct_size (9d-9a-91)
+ */
+ static const uint8_t attr_meta[] = {
0xc0,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x20,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
- };
- static const uint8_t attr_data[] = {
+ };
+ static const uint8_t attr_data[] = {
0x60,0x3d,0xeb,0x10,0x15,0xca,0x71,0xbe,0x2b,0x73,0xae,0xf0,0x85,0x7d,0x77,
0x81,0x1f,0x35,0x2c,0x07,0x3b,0x61,0x08,0xd7,0x2d,0x98,0x10,0xa3,0x09,0x14,
0xdf,0xf4,
- };
+ };
- if (!ADBG_EXPECT_TEEC_SUCCESS(
- c, xtest_teec_open_session(
- &sess, &gp_tta_ds_uuid, NULL, &orig)))
- return;
+ if (!ADBG_EXPECT_TEEC_SUCCESS(
+ c, xtest_teec_open_session(&sess, &gp_tta_ds_uuid,
+ NULL, &orig)))
+ return;
- if (!ADBG_EXPECT_TEEC_SUCCESS(c, ds_init_object_and_attributes(&sess,
- 0xa0000010, 0x100, attr_meta, sizeof(attr_meta), attr_data,
- sizeof(attr_data), 0)))
- goto exit;
+ if (!ADBG_EXPECT_TEEC_SUCCESS(
+ c, ds_init_object_and_attributes(&sess, 0xa0000010,
+ 0x100, attr_meta, sizeof(attr_meta),
+ attr_data, sizeof(attr_data), 0)))
+ goto exit;
exit:
- TEEC_CloseSession(&sess);
+ TEEC_CloseSession(&sess);
}
ADBG_CASE_DEFINE(regression, 6011, xtest_tee_test_6011,
"Test TEE GP TTA DS init objects");
@@ -1515,8 +1517,8 @@
static void xtest_tee_test_6012_single(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Session sess;
- uint32_t orig;
+ TEEC_Session sess = { };
+ uint32_t orig = 0;
uint32_t obj = 0;
/*
@@ -1589,8 +1591,8 @@
static void xtest_tee_test_6013_single(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Session sess;
- uint32_t orig;
+ TEEC_Session sess = { };
+ uint32_t orig = 0;
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
if (!ADBG_EXPECT_TEEC_SUCCESS(c,
@@ -1613,8 +1615,8 @@
static void xtest_tee_test_6014_single(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Session sess;
- uint32_t orig;
+ TEEC_Session sess = { };
+ uint32_t orig = 0;
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
if (!ADBG_EXPECT_TEEC_SUCCESS(c,
@@ -1636,11 +1638,11 @@
static void xtest_tee_test_6015_single(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Session sess;
- TEEC_Session sess2;
- uint32_t orig;
+ TEEC_Session sess = { };
+ TEEC_Session sess2 = { };
+ uint32_t orig = 0;
uint32_t obj = 0;
- uint32_t obj2;
+ uint32_t obj2 = 0;
if (!ADBG_EXPECT_TEEC_SUCCESS(c,
xtest_teec_open_session(&sess, &storage_ta_uuid, NULL, &orig)))
@@ -1688,7 +1690,7 @@
struct test_6016_thread_arg *a = arg;
TEEC_Session sess = a->session;
uint32_t obj = 0;
- uint8_t out[10] = { 0 };
+ uint8_t out[10] = { };
uint32_t count = 0;
/* create */
@@ -1739,23 +1741,20 @@
#define NUM_THREADS 4
static void xtest_tee_test_6016_loop(ADBG_Case_t *c, uint32_t storage_id)
{
- size_t num_threads = NUM_THREADS;
- struct test_6016_thread_arg arg[num_threads];
- pthread_t thr[num_threads];
- uint32_t orig;
- size_t i;
+ struct test_6016_thread_arg arg[NUM_THREADS] = { };
+ uint32_t orig = 0;
+ size_t i = 0;
size_t n = 0;
- size_t m;
+ size_t m = 0;
+ pthread_t thr[NUM_THREADS] = { };
- memset(arg, 0, sizeof(arg));
-
- for (m = 0; m < num_threads; m++)
+ for (m = 0; m < NUM_THREADS; m++)
if (!ADBG_EXPECT_TEEC_SUCCESS(c,
xtest_teec_open_session(&arg[m].session,
&storage_ta_uuid, NULL, &orig)))
goto out;
- for (n = 0; n < num_threads; n++) {
+ for (n = 0; n < NUM_THREADS; n++) {
arg[n].case_t = c;
arg[n].storage_id = storage_id;
snprintf(arg[n].file_name, sizeof(arg[n].file_name),
@@ -1775,7 +1774,7 @@
/* concurency */
static void xtest_tee_test_6016_single(ADBG_Case_t *c, uint32_t storage_id)
{
- int i;
+ int i = 0;
int loops = 8;
Do_ADBG_Log(" threads: %d, loops: %d", NUM_THREADS, loops);
@@ -1787,11 +1786,11 @@
static void xtest_tee_test_6017_single(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Session sess;
- TEE_ObjectInfo obj_info1;
- TEE_ObjectInfo obj_info2;
+ TEEC_Session sess = { };
+ TEE_ObjectInfo obj_info1 = { };
+ TEE_ObjectInfo obj_info2 = { };
uint32_t obj = 0;
- uint32_t orig;
+ uint32_t orig = 0;
if (!ADBG_EXPECT_TEEC_SUCCESS(c,
xtest_teec_open_session(&sess, &storage_ta_uuid, NULL, &orig)))
@@ -1842,15 +1841,15 @@
static void xtest_tee_test_6018_single(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Session sess;
- TEE_ObjectInfo obj_info1;
- TEE_ObjectInfo obj_info2;
+ TEEC_Session sess = { };
+ TEE_ObjectInfo obj_info1 = { };
+ TEE_ObjectInfo obj_info2 = { };
uint32_t obj = 0;
- uint32_t orig;
- uint8_t block[32 * 1024];
- size_t num_blocks;
- size_t block_size;
- size_t n;
+ uint32_t orig = 0;
+ uint8_t block[32 * 1024] = { };
+ size_t num_blocks = 0;
+ size_t block_size = 0;
+ size_t n = 0;
if (storage_is(storage_id, TEE_STORAGE_PRIVATE_RPMB)) {
/* RPMB FS is a bit resource constrained */
@@ -1911,6 +1910,7 @@
uint8_t br[block_size];
uint32_t count = 0;
+ memset(br, 0, sizeof(br));
memset(block, n, block_size);
Do_ADBG_Log("reading %zu", n);
@@ -1933,12 +1933,12 @@
static void xtest_tee_test_6019_single(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Session sess;
- TEEC_Session sess2;
- uint32_t orig;
+ TEEC_Session sess = { };
+ TEEC_Session sess2 = { };
+ uint32_t orig = 0;
uint32_t obj = 0;
uint32_t obj2 = 0;
- uint8_t out[10] = { 0 };
+ uint8_t out[10] = { };
uint32_t count = 0;
if (!ADBG_EXPECT_TEEC_SUCCESS(c,
@@ -2031,8 +2031,8 @@
uint32_t storage_id)
{
TEEC_Operation op = TEEC_OPERATION_INITIALIZER;
- TEEC_Result res;
- uint32_t org;
+ TEEC_Result res = TEEC_ERROR_GENERIC;
+ uint32_t org = 0;
switch (command) {
case TA_STORAGE_CMD_OPEN_ID_IN_SHM:
@@ -2101,9 +2101,9 @@
static void xtest_tee_test_6020_single(ADBG_Case_t *c, uint32_t storage_id)
{
- TEEC_Result res;
- TEEC_Session sess;
- uint32_t orig;
+ TEEC_Result res = TEEC_ERROR_GENERIC;
+ TEEC_Session sess = { };
+ uint32_t orig = 0;
uint32_t obj = 0;
/*