test: update ta_load test to use memory object

Run unittest path_to_bin 0 cmd [use buffer]
Run unittest path_to_bin 1 cmd [use memory object]

Signed-off-by: Amirreza Zarrabi <[email protected]>

Author: qc-azarrabi

tests/common.c

@@ -150,13 +150,14 @@ test_get_service_object(struct qcomtee_object *client_env_object, uint32_t uid)
 
 /* File stuff. */
 
+/* On error returns "0"; otherwise file size (which could be "0"). */
 size_t test_get_file_size(FILE *file)
 {
 	ssize_t size;
 
 	if (fseek(file, 0, SEEK_END)) {
 		PRINT("%s\n", strerror(errno));
-		return -1;
+		return 0;
 	}
 
 	size = ftell(file);
@@ -167,55 +168,96 @@ size_t test_get_file_size(FILE *file)
 
 	if (fseek(file, 0, SEEK_SET)) {
 		PRINT("%s\n", strerror(errno));
-		return -1;
+		return 0;
 	}
 
 	return size;
 }
 
-int test_read_file(const char *filename, char **buffer, size_t *size)
+/* On error returns "0"; otherwise file size (which could be "0"). */
+size_t test_get_file_size_by_filename(const char *filename)
+{
+	FILE *file;
+	size_t file_size;
+
+	file = fopen(filename, "r");
+	if (!file) {
+		PRINT("%s\n", strerror(errno));
+		return 0;
+	}
+
+	file_size = test_get_file_size(file);
+	fclose(file);
+
+	return file_size;
+}
+
+/**
+ * @brief Read a file.
+ *
+ * If buffer is NULL, it allocated the buffer. Caller should free the buffer.
+ *
+ * @param filename Path to the file.
+ * @param buffer Buffer to read the file.
+ * @param size Size of the buffer.
+ * @return On success, returns size of the file; Otherwise, returns 0. 
+ */
+size_t test_read_file(const char *filename, char **buffer, size_t size)
 {
-	int ret = -1;
 	FILE *file;
 	char *file_buf;
 	size_t file_size;
 
 	file = fopen(filename, "r");
 	if (!file) {
 		PRINT("%s\n", strerror(errno));
-		return -1;
+		return 0;
 	}
 
 	file_size = test_get_file_size(file);
 	if (!file_size)
 		goto out;
 
-	file_buf = malloc(file_size);
-	if (!file_buf) {
-		PRINT("malloc,\n");
-		goto out;
+	if (size > 0) {
+		/* User provided the buffer; make sure it is large enough. */
+		if (size < file_size) {
+			PRINT("no space.\n");
+			file_size = 0; /* Unable to read. */
+
+			goto out;
+		}
+
+		file_buf = *buffer;
+	} else {
+		/* User did not provide the buffer; allocate one. */
+		file_buf = malloc(file_size);
+		if (!file_buf) {
+			PRINT("malloc.\n");
+			file_size = 0; /* Unable to read. */
+
+			goto out;
+		}
 	}
 
 	PRINT("File %s, size: %lu Bytes.\n", filename, file_size);
 
 	if (fread(file_buf, 1, file_size, file) != file_size) {
 		PRINT("fread.\n");
-		free(file_buf);
+		if (size == 0)
+			free(file_buf);
+		file_size = 0; /* Unable to read. */
 		goto out;
 	}
 
 	*buffer = file_buf;
-	*size = file_size;
-
-	ret = 0;
 out:
 	fclose(file);
 
-	return ret;
+	return file_size;
 }
 
-int test_read_file2(const char *pathname, const char *name, char **buffer,
-		    size_t *size)
+size_t test_read_file2(const char *pathname, const char *name, char **buffer,
+		       size_t size)
 {
 	char filename[1024] = { 0 };
 	/* Hope it fits! */

tests/main.c

@@ -10,7 +10,7 @@ static void usage(char *name)
 	printf("OPTION are:\n"
 	       "\t-d - Run the TZ diagnostics test that prints basic info on TZ heaps.\n"
 	       "\t-l - Load the test TA and send command.\n"
-	       "\t\t%s -l <path to TA binary> <command>\n"
+	       "\t\t%s -l <path to TA binary> <buffer vs. memory object> <command>\n"
 	       "\t-h - Print this help message and exit\n\n",
 	       name);
 }
@@ -22,10 +22,10 @@ int main(int argc, char *argv[])
 		test_print_diagnostics_info();
 		break;
 	case 'l':
-		if (argc != 4)
+		if (argc != 5)
 			goto help;
 
-		test_load_sample_ta(argv[2], atoi(argv[3]));
+		test_load_sample_ta(argv[2], atoi(argv[3]), atoi(argv[4]));
 		break;
 help:
 	case 'h':

tests/ta_load.c

@@ -4,6 +4,9 @@
 #include <time.h>
 #include "tests_private.h"
 
+/* ROOT used in this test. */
+static struct qcomtee_object *root;
+
 static int test_ta_cmd_0(struct qcomtee_object *ta)
 {
 	struct qcomtee_param params[2];
@@ -44,29 +47,71 @@ struct ta {
 	struct qcomtee_object *ta;
 };
 
-static struct ta test_load_ta(struct qcomtee_object *service_object,
+static struct ta test_load_ta(struct qcomtee_object *service_object, int use_mo,
 			      const char *pathname)
 {
 	struct ta ta = { QCOMTEE_OBJECT_NULL, QCOMTEE_OBJECT_NULL };
 	struct qcomtee_param params[2];
 	qcomtee_result_t result;
-
 	char *buffer;
 	size_t size;
-	/* Read the TA file. */
-	if (test_read_file2(pathname, TEST_TA, &buffer, &size))
-		return ta;
-
-	/* INIT parameters and invoke object: */
-	params[0].attr = QCOMTEE_UBUF_INPUT;
-	params[0].ubuf.addr = buffer;
-	params[0].ubuf.size = size;
-	params[1].attr = QCOMTEE_OBJREF_OUTPUT;
-	/* 0 is IAppLoader_OP_loadFromBuffer. */
-	if (qcomtee_object_invoke(service_object, 0, params, 2, &result) ||
-	    (result != QCOMTEE_OK)) {
-		PRINT("qcomtee_object_invoke.\n");
-		goto failed_out;
+	int ret;
+
+	if (!use_mo) {
+		/* Read the TA file. */
+		size = test_read_file2(pathname, TEST_TA, &buffer, 0);
+		if (!size)
+			return ta;
+
+		/* INIT parameters and invoke object: */
+		params[0].attr = QCOMTEE_UBUF_INPUT;
+		params[0].ubuf.addr = buffer;
+		params[0].ubuf.size = size;
+		params[1].attr = QCOMTEE_OBJREF_OUTPUT;
+		/* 0 is IAppLoader_OP_loadFromBuffer. */
+		ret = qcomtee_object_invoke(service_object, 0, params, 2,
+					    &result);
+
+		/* Free buffer allocated in test_read_file2. */
+		free(buffer);
+
+		if (ret || (result != QCOMTEE_OK)) {
+			PRINT("qcomtee_object_invoke.\n");
+			return ta;
+		}
+	} else {
+		struct qcomtee_object *mo;
+
+		size = test_get_file_size_by_filename(pathname);
+		if (!size)
+			return ta;
+
+		/* Allocate a memory object for the file contents. */
+		if (qcomtee_memory_object_alloc(size, root, &mo))
+			return ta;
+
+		buffer = qcomtee_memory_object_addr(mo);
+		/* Read the TA file. */
+		size = test_read_file2(pathname, TEST_TA, &buffer,
+				       qcomtee_memory_object_size(mo));
+		if (!size)
+			return ta;
+
+		/* INIT parameters and invoke object: */
+		params[0].attr = QCOMTEE_OBJREF_INPUT;
+		params[0].object = mo;
+		params[1].attr = QCOMTEE_OBJREF_OUTPUT;
+		/* 1 is IAppLoader_OP_loadFromRegion. */
+		ret = qcomtee_object_invoke(service_object, 1, params, 2,
+					    &result);
+
+		/* The memoy object donated to QTEE; release it. QTEE releases it's copy. */
+		qcomtee_memory_object_release(mo);
+
+		if (ret || (result != QCOMTEE_OK)) {
+			PRINT("qcomtee_object_invoke.\n");
+			return ta;
+		}
 	}
 
 	ta.ta_controller = params[1].object;
@@ -77,21 +122,18 @@ static struct ta test_load_ta(struct qcomtee_object *service_object,
 	if (qcomtee_object_invoke(ta.ta_controller, 2, params, 1, &result) ||
 	    (result != QCOMTEE_OK)) {
 		PRINT("qcomtee_object_invoke.\n");
-		goto failed_out;
+		return ta;
 	}
 
 	ta.ta = params[0].object;
 
-failed_out:
-	free(buffer);
-
 	return ta;
 }
 
-void test_load_sample_ta(const char *pathname, int cmd)
+void test_load_sample_ta(const char *pathname, int use_mo, int cmd)
 {
 	struct ta test_ta;
-	struct qcomtee_object *root, *client_env_object, *service_object;
+	struct qcomtee_object *client_env_object, *service_object;
 
 	/* Get root + supplicant. */
 	root = test_get_root();
@@ -114,7 +156,7 @@ void test_load_sample_ta(const char *pathname, int cmd)
 	}
 
 	/* Load the TA. */
-	test_ta = test_load_ta(service_object, pathname);
+	test_ta = test_load_ta(service_object, use_mo, pathname);
 	if (test_ta.ta == QCOMTEE_OBJECT_NULL) {
 		PRINT("test_load_ta.\n");
 		goto dec_service_object;

tests/tests_private.h

@@ -40,9 +40,10 @@ test_get_service_object(struct qcomtee_object *client_env_object, uint32_t uid);
 
 /* File stuff. */
 size_t test_get_file_size(FILE *file);
-int test_read_file(const char *filename, char **buffer, size_t *size);
-int test_read_file2(const char *pathname, const char *name, char **buffer,
-		    size_t *size);
+size_t test_get_file_size_by_filename(const char *filename);
+size_t test_read_file(const char *filename, char **buffer, size_t size);
+size_t test_read_file2(const char *pathname, const char *name, char **buffer,
+		       size_t size);
 
 #define PRINT(fmt, ...) \
 	printf("[%s][%d] " fmt, __func__, __LINE__, ##__VA_ARGS__)
@@ -56,6 +57,6 @@ void test_print_diagnostics_info(void);
 /* ta_load.c. */
 #define TEST_TA "smcinvoke_skeleton_ta64.mbn"
 
-void test_load_sample_ta(const char *pathname, int cmd);
+void test_load_sample_ta(const char *pathname, int use_mo, int cmd);
 
 #endif // _TESTS_PRIVATE_H