Merge pull request #18 from qc-azarrabi/debug-fix

So random update

Author: harshaldev27

libqcomtee/include/qcomtee_object_types.h

@@ -10,12 +10,10 @@
  * @brief Get a credentials object.
  * @param root The root object to which this object belongs.
  * @param object Credentials object.
- * @return On success returns @ref QCOMTEE_OK;
- *         Otherwise @ref QCOMTEE_ERROR_MEM.
+ * @return On success, returns 0; Otherwise, returns -1.
  */
-qcomtee_result_t
-qcomtee_object_credentials_init(struct qcomtee_object *root,
-				struct qcomtee_object **object);
+int qcomtee_object_credentials_init(struct qcomtee_object *root,
+				    struct qcomtee_object **object);
 
 /* Select qcomtee_memory_object_alloc vs. qcomtee_memory_object_register. */
 #define qcomtee_memory_object_tee_api_select(a, b, c, d, fun, ...) fun

libqcomtee/src/objects/credentials_obj.c

@@ -139,26 +139,25 @@ static struct qcomtee_object_ops ops = {
 	.dispatch = qcomtee_object_credentials_dispatch,
 };
 
-qcomtee_result_t
-qcomtee_object_credentials_init(struct qcomtee_object *root,
-				struct qcomtee_object **object)
+int qcomtee_object_credentials_init(struct qcomtee_object *root,
+				    struct qcomtee_object **object)
 {
 	struct qcomtee_credentials *qcomtee_cred;
 
 	qcomtee_cred = calloc(1, sizeof(*qcomtee_cred));
 	if (!qcomtee_cred)
-		return QCOMTEE_ERROR_MEM;
+		return -1;
 
 	qcomtee_object_cb_init(&qcomtee_cred->object, &ops, root);
 	/* INIT the credentials buffer. */
 	if (credentials_init(&qcomtee_cred->ubuf)) {
 		free(qcomtee_cred);
 
-		return QCOMTEE_ERROR_MEM;
+		return -1;
 	}
 
 	/* Get the credentials object. */
 	*object = &qcomtee_cred->object;
 
-	return QCOMTEE_OK;
+	return 0;
 }

tests/common.c

@@ -30,7 +30,7 @@ static int tee_call(int fd, int op, ...)
 	ret = ioctl(fd, op, arg);
 	pthread_setcanceltype(PTHREAD_CANCEL_DEFERRED, NULL);
 	if (ret < 0)
-		PRINT("ioctl: %s\n", strerror(errno));
+		MSG_ERROR("%s\n", strerror(errno));
 
 	return ret;
 }
@@ -46,7 +46,7 @@ static void *test_supplicant_worker(void *arg)
 			break;
 	}
 
-	PRINT("qcomtee_object_process_one.\n");
+	MSG_INFO("Supplicant thread exited\n");
 
 	return NULL;
 }
@@ -66,7 +66,8 @@ static void test_supplicant_release(void *arg)
 		pthread_join(sup->thread, NULL);
 	}
 
-	PRINT("test_supplicant_worker killed.\n");
+	MSG_INFO("Supplicant thread killed.\n");
+
 	free(sup);
 }
 
@@ -77,23 +78,27 @@ struct qcomtee_object *test_get_root(void)
 	pthread_t thread;
 
 	sup = calloc(1, sizeof(*sup));
-	if (!sup)
+	if (!sup) {
+		MSG_ERROR("%s\n", strerror(errno));
 		return QCOMTEE_OBJECT_NULL;
+	}
 
 	/* Start a fresh namespace. */
 	root = qcomtee_object_root_init(DEV_TEE, tee_call,
 					test_supplicant_release, sup);
-	if (root == QCOMTEE_OBJECT_NULL)
+	if (root == QCOMTEE_OBJECT_NULL) {
+		MSG_ERROR("Unable to initialize the root object\n");
 		goto failed_out;
+	}
 
 	sup->root = root;
-
 	/* Start a supplicant thread. */
-	if (pthread_create(&thread, NULL, test_supplicant_worker, sup))
+	if (pthread_create(&thread, NULL, test_supplicant_worker, sup)) {
+		MSG_ERROR("Unable to start supplicant thread\n");
 		goto failed_out;
+	}
 
 	sup->thread = thread;
-
 	return root;
 
 failed_out:
@@ -109,24 +114,29 @@ struct qcomtee_object *test_get_client_env_object(struct qcomtee_object *root)
 	struct qcomtee_param params[2];
 	qcomtee_result_t result;
 
-	if (qcomtee_object_credentials_init(root, &creds_object))
+	if (qcomtee_object_credentials_init(root, &creds_object)) {
+		MSG_ERROR("Unable to initialize the credential object\n");
 		return QCOMTEE_OBJECT_NULL;
+	}
 
 	/* INIT parameters and invoke object: */
 	params[0].attr = QCOMTEE_OBJREF_INPUT;
 	params[0].object = creds_object;
 	params[1].attr = QCOMTEE_OBJREF_OUTPUT;
 	/* 2 is IClientEnv_OP_registerAsClient. */
 	if (qcomtee_object_invoke(root, 2, params, 2, &result)) {
+		/* Releases creds_object. */
 		qcomtee_object_refs_dec(creds_object);
-		return QCOMTEE_OBJECT_NULL;
+		goto failed_out;
 	}
 
 	/* qcomtee_object_invoke was successful; QTEE releases creds_object. */
 
 	if (!result)
 		return params[1].object;
 
+failed_out:
+	MSG_ERROR("Unable to obtain the env object, result %d\n", result);
 	return QCOMTEE_OBJECT_NULL;
 }
 
@@ -142,9 +152,13 @@ test_get_service_object(struct qcomtee_object *client_env_object, uint32_t uid)
 	params[1].attr = QCOMTEE_OBJREF_OUTPUT;
 	/* 0 is IClientEnv_OP_open. */
 	if (qcomtee_object_invoke(client_env_object, 0, params, 2, &result) ||
-	    (result != QCOMTEE_OK))
+	    (result != QCOMTEE_OK)) {
+		MSG_ERROR("Unable to obtain object (UID = %u), result %d\n",
+			  uid, result);
 		return QCOMTEE_OBJECT_NULL;
+	}
 
+	MSG_INFO("Obtained object (UID = %u)\n", uid);
 	return params[1].object;
 }
 
@@ -156,18 +170,18 @@ size_t test_get_file_size(FILE *file)
 	ssize_t size;
 
 	if (fseek(file, 0, SEEK_END)) {
-		PRINT("%s\n", strerror(errno));
+		MSG_ERROR("%s\n", strerror(errno));
 		return 0;
 	}
 
 	size = ftell(file);
 	if (size < 0) {
-		PRINT("%s\n", strerror(errno));
+		MSG_ERROR("%s\n", strerror(errno));
 		return 0;
 	}
 
 	if (fseek(file, 0, SEEK_SET)) {
-		PRINT("%s\n", strerror(errno));
+		MSG_ERROR("%s\n", strerror(errno));
 		return 0;
 	}
 
@@ -186,7 +200,8 @@ size_t test_get_file_size_by_filename(const char *pathname, const char *name)
 
 	file = fopen(filename, "r");
 	if (!file) {
-		PRINT("%s\n", strerror(errno));
+		MSG_ERROR("%s\n", strerror(errno));
+
 		return 0;
 	}
 
@@ -214,7 +229,8 @@ size_t test_read_file(const char *filename, char **buffer, size_t size)
 
 	file = fopen(filename, "r");
 	if (!file) {
-		PRINT("%s\n", strerror(errno));
+		MSG_ERROR("%s\n", strerror(errno));
+
 		return 0;
 	}
 
@@ -225,7 +241,7 @@ size_t test_read_file(const char *filename, char **buffer, size_t size)
 	if (size > 0) {
 		/* User provided the buffer; make sure it is large enough. */
 		if (size < file_size) {
-			PRINT("no space.\n");
+			MSG_ERROR("Buffer is small (required %lu)\n", file_size);
 			file_size = 0; /* Unable to read. */
 
 			goto out;
@@ -236,17 +252,17 @@ size_t test_read_file(const char *filename, char **buffer, size_t size)
 		/* User did not provide the buffer; allocate one. */
 		file_buf = malloc(file_size);
 		if (!file_buf) {
-			PRINT("malloc.\n");
+			MSG_ERROR("%s\n", strerror(errno));
 			file_size = 0; /* Unable to read. */
 
 			goto out;
 		}
 	}
 
-	PRINT("File %s, size: %lu Bytes.\n", filename, file_size);
+	MSG_INFO("Reading %s, %lu Bytes.\n", filename, file_size);
 
 	if (fread(file_buf, 1, file_size, file) != file_size) {
-		PRINT("fread.\n");
+		MSG_ERROR("%s\n", feof(file) ? "EOF" : strerror(errno));
 		if (size == 0)
 			free(file_buf);
 		file_size = 0; /* Unable to read. */

tests/diagnostics.c

@@ -19,45 +19,43 @@ void test_print_diagnostics_info(void)
 	struct qcomtee_param params[1];
 	qcomtee_result_t result;
 
+	MSG("Starting test_print_diagnostics_info\n");
+
 	/* Get root + supplicant. */
 	root = test_get_root();
-	if (root == QCOMTEE_OBJECT_NULL) {
-		PRINT("test_get_root.\n");
+	if (root == QCOMTEE_OBJECT_NULL)
 		return;
-	}
 
 	client_env_object = test_get_client_env_object(root);
-	if (client_env_object == QCOMTEE_OBJECT_NULL) {
-		PRINT("test_get_client_env_object.\n");
+	if (client_env_object == QCOMTEE_OBJECT_NULL)
 		goto dec_root_object;
-	}
 
 	/* 143 is UID of Diagnostics service. */
 	service_object = test_get_service_object(client_env_object, 143);
-	if (service_object == QCOMTEE_OBJECT_NULL) {
-		PRINT("test_get_service_object.\n");
+	if (service_object == QCOMTEE_OBJECT_NULL)
 		goto dec_client_env_object;
-	}
 
 	/* INIT parameters and invoke object: */
 	params[0].attr = QCOMTEE_UBUF_OUTPUT;
 	params[0].ubuf = UBUF_INIT(&heap_info);
 	/* 0 is IDiagnostics_OP_queryHeapInfo. */
 	if (qcomtee_object_invoke(service_object, 0, params, 1, &result) ||
 	    (result != QCOMTEE_OK)) {
-		PRINT("qcomtee_object_invoke.\n");
+		MSG_ERROR("Unable to obtain diagnostics info, result %d\n",
+			  result);
 		goto dec_service_object;
 	}
 
-	PRINT("%-15d = Total bytes as heap\n", heap_info.total_size);
-	PRINT("%-15d = Total bytes allocated from heap\n", heap_info.used_size);
-	PRINT("%-15d = Total bytes free on heap\n", heap_info.free_size);
-	PRINT("%-15d = Total bytes overhead\n", heap_info.overhead_size);
-	PRINT("%-15d = Total bytes wasted\n", heap_info.wasted_size);
-	PRINT("%-15d = Largest free block size\n\n",
-	      heap_info.largest_free_block_size);
+	MSG_INFO("%-15d = Total bytes as heap\n", heap_info.total_size);
+	MSG_INFO("%-15d = Total bytes allocated from heap\n",
+		 heap_info.used_size);
+	MSG_INFO("%-15d = Total bytes free on heap\n", heap_info.free_size);
+	MSG_INFO("%-15d = Total bytes overhead\n", heap_info.overhead_size);
+	MSG_INFO("%-15d = Total bytes wasted\n", heap_info.wasted_size);
+	MSG_INFO("%-15d = Largest free block size\n\n",
+		 heap_info.largest_free_block_size);
 
-	PRINT("SUCCESS.\n");
+	MSG_INFO("SUCCESS.\n");
 
 dec_service_object:
 	qcomtee_object_refs_dec(service_object);