xtest: regression: check and report fs_unlink() return value

Let ta_storage_cmd_unlink() propagate the return value from TEE_CloseAndDeletePersistentObject1() instead of returning TEE_SUCCESS. Check and report the return value from fs_unlink() in check_storage_available(). Signed-off-by: pengyinjie <[email protected]> Reviewed-by: Jens Wiklander <[email protected]>
OP-TEE · Jun 7, 2024 · 091619c · 091619c
1 parent a19c6d9
commit 091619c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/host/xtest/regression_6000.c b/host/xtest/regression_6000.c
@@ -466,7 +466,9 @@ static TEEC_Result check_storage_available(uint32_t id, bool *avail)
 	switch (res) {
 	case TEEC_SUCCESS:
 		*avail = true;
-		fs_unlink(&sess, obj);
+		res = fs_unlink(&sess, obj);
+		if (res != TEEC_SUCCESS)
+			Do_ADBG_Log("fs_unlink() failed");
 		break;
 	case TEE_ERROR_ITEM_NOT_FOUND:
 	case TEE_ERROR_STORAGE_NOT_AVAILABLE:

diff --git a/ta/storage/storage.c b/ta/storage/storage.c
@@ -243,9 +243,7 @@ TEE_Result ta_storage_cmd_unlink(uint32_t param_types, TEE_Param params[4])
 			  (TEE_PARAM_TYPE_VALUE_INPUT, TEE_PARAM_TYPE_NONE,
 			   TEE_PARAM_TYPE_NONE, TEE_PARAM_TYPE_NONE));
 
-	TEE_CloseAndDeletePersistentObject1(o);
-
-	return TEE_SUCCESS;
+	return TEE_CloseAndDeletePersistentObject1(o);
 }
 
 TEE_Result ta_storage_cmd_rename(uint32_t command, uint32_t param_types,