Skip to content

Commit df39774

Browse files
committed
tee: optee: do not check memref size on return from Secure World
When Secure World returns, it may have changed the size attribute of the memory references passed as [in/out] parameters. The GlobalPlatform TEE Internal Core API specification does not restrict the values that this size can take. In particular, Secure World may increase the value to be larger than the size of the input buffer to indicate that it needs more. Therefore, the size check in optee_from_msg_param() is incorrect and needs to be removed. This fixes a number of failed test cases in the GlobalPlatform TEE Initial Configuratiom Test Suite v2_0_0_0-2017_06_09 when OP-TEE is compiled without dynamic shared memory support (CFG_CORE_DYN_SHM=n). Suggested-by: Jens Wiklander <[email protected]> Signed-off-by: Jerome Forissier <[email protected]>
1 parent 5247548 commit df39774

File tree

1 file changed

+0
-10
lines changed

1 file changed

+0
-10
lines changed

drivers/tee/optee/core.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,6 @@ int optee_from_msg_param(struct tee_param *params, size_t num_params,
8080
return rc;
8181
p->u.memref.shm_offs = mp->u.tmem.buf_ptr - pa;
8282
p->u.memref.shm = shm;
83-
84-
/* Check that the memref is covered by the shm object */
85-
if (p->u.memref.size) {
86-
size_t o = p->u.memref.shm_offs +
87-
p->u.memref.size - 1;
88-
89-
rc = tee_shm_get_pa(shm, o, NULL);
90-
if (rc)
91-
return rc;
92-
}
9383
break;
9484
case OPTEE_MSG_ATTR_TYPE_RMEM_INPUT:
9585
case OPTEE_MSG_ATTR_TYPE_RMEM_OUTPUT:

0 commit comments

Comments
 (0)