Modify obj usage for persistence object

[kyoWNC]

optee-4.0.0
Case: Create a pure data object that can not share to CA

1. Use the TEE_CreatePersistentObject API to create a pure data object (ID: obj1) (default obj usage is 0xffffffff)
2. Modify the object usage to 0xfffffffe using TEE_RestrictObjectUsage1
3. Call TEE_GetObjectInfo1 to check object usage, obtaining the result 0xfffffffe

But when using the TEE_GetObjectInfo1 API to get object usage from another CA, it will return 0xffffffff.
Is this the expected result?

Thanks

[jenswi-linaro]

That's not expected. While looking at the code

optee_os/core/tee/tee_svc_cryp.c

Lines 1197 to 1212 in c7f9abc

	TEE_Result syscall_cryp_obj_restrict_usage(unsigned long obj,
	unsigned long usage)
	{
	struct ts_session *sess = ts_get_current_session();
	TEE_Result res = TEE_SUCCESS;
	struct tee_obj *o = NULL;
	res = tee_obj_get(to_user_ta_ctx(sess->ctx), uref_to_vaddr(obj), &o);
	if (res != TEE_SUCCESS)
	goto exit;
	o->info.objectUsage &= usage;
	exit:
	return res;
	}

I can't find anything obvious. We don't have a test case for this in xtest. Could you create such a test case? With a test case to demonstrate the problem, it is much easier to fix it, besides a test case would guarantee that this remains working after an eventual fix has been merged.

[jenswi-linaro]

I see how this might fail now. Yeah, this is a bug.

[kyoWNC]

Hi jenswi-linaro,
I added the following code into regression_6000.c for the xtest.

static void xtest_tee_test_6021_single(ADBG_Case_t *c, uint32_t storage_id) 
{
	TEEC_Result res = TEEC_ERROR_GENERIC;
	TEEC_Session sess = { };
	uint32_t orig = 0;
	uint32_t obj = 0;
	TEE_ObjectInfo obj_info = { };
	
	res = xtest_teec_open_session(&sess, &storage_ta_uuid, NULL, &orig);
	if (!ADBG_EXPECT_TEEC_SUCCESS(c, res))
		return;

	res = fs_create(&sess, file_01, sizeof(file_01),
				TEE_DATA_FLAG_ACCESS_READ |
				TEE_DATA_FLAG_ACCESS_WRITE |
				TEE_DATA_FLAG_ACCESS_WRITE_META,
				0,
				data_00, sizeof(data_00),
				&obj,
				storage_id);
	if (!ADBG_EXPECT_TEEC_SUCCESS(c, res))
		goto exit;

	res = fs_get_obj_info(&sess, obj, &obj_info);
	if (!ADBG_EXPECT_TEEC_SUCCESS(c, res))
		goto exit;
	ADBG_EXPECT_COMPARE_UNSIGNED(c, obj_info.objectUsage, ==, 0xffffffff);

	res = fs_restrict_usage(&sess, obj, 0xfffffffe);
	if (!ADBG_EXPECT_TEEC_SUCCESS(c, res))
		goto exit;

	res = fs_get_obj_info(&sess, obj, &obj_info);
	if (!ADBG_EXPECT_TEEC_SUCCESS(c, res))
		goto exit;
	ADBG_EXPECT_COMPARE_UNSIGNED(c, obj_info.objectUsage, ==, 0xfffffffe);

	ADBG_EXPECT_TEEC_SUCCESS(c, fs_close(&sess, obj));
	TEEC_CloseSession(&sess);
	

	res = xtest_teec_open_session(&sess, &storage_ta_uuid, NULL, &orig);
	if (!ADBG_EXPECT_TEEC_SUCCESS(c, res))
		return;

	res = fs_open(&sess, file_01, sizeof(file_01),
				TEE_DATA_FLAG_ACCESS_READ |
				TEE_DATA_FLAG_ACCESS_WRITE |
				TEE_DATA_FLAG_ACCESS_WRITE_META, &obj, storage_id);
	if (!ADBG_EXPECT_TEEC_SUCCESS(c, res))
		goto exit;

	res = fs_get_obj_info(&sess, obj, &obj_info);
	if (!ADBG_EXPECT_TEEC_SUCCESS(c, res)) 
		goto exit;
	ADBG_EXPECT_COMPARE_UNSIGNED(c, obj_info.objectUsage, ==, 0xfffffffe);

exit:
	ADBG_EXPECT_TEEC_SUCCESS(c, fs_unlink(&sess, obj));
	TEEC_CloseSession(&sess);
	return;
}
DEFINE_TEST_MULTIPLE_STORAGE_IDS(xtest_tee_test_6021)
ADBG_CASE_DEFINE(regression, 6021, xtest_tee_test_6021,
		 "Modify and check object usage");

Thanks for your help

[jenswi-linaro]

Fixed in #6505

I can add a Reported-by: tag if you supply your name and email address.

The test is added in OP-TEE/optee_test#715

Feel free to provide your Signed-off-by: tag in the test PR if you want it included in the new test.

[kyoWNC]

It's ok.
The great thing is that the issue can be resolved :)
I will try this patch.
Thank you.