Skip to content

Commit

Permalink
optee: allow plain TMEM buffers with NULL address
Browse files Browse the repository at this point in the history
Trusted Applications use a popular approach to determine the required
size of a buffer: the client provides a memory reference with the NULL
pointer to a buffer. This is so called "Null memory reference". TA
updates the reference with the required size and returns it back to the
client. Then the client allocates a buffer of the needed size and
repeats the operation.

This behavior is described in TEE Client API Specification, paragraph
3.2.5. Memory References.

OP-TEE represents this null memory reference as a TMEM parameter with
buf_ptr = 0x0. This is the only case when we should allow a TMEM
buffer without the OPTEE_MSG_ATTR_NONCONTIG flag. This also the
special case for a buffer with OPTEE_MSG_ATTR_NONCONTIG flag.

This could lead to a potential issue, because IPA 0x0 is a valid
address, but OP-TEE will treat it as a special case. So, care should
be taken when construction OP-TEE enabled guest to make sure that such
guest have no memory at IPA 0x0 and none of its memory is mapped at PA
0x0.

Signed-off-by: Volodymyr Babchuk <volodymyr_babchuk@epam.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
Signed-off-by: Stefano Stabellini <stefano.stabellini@xilinx.com>
Release-acked-by: Paul Durrant <paul@xen.org>
  • Loading branch information
lorc authored and sstabellini committed Jul 1, 2020
1 parent 5b13eb1 commit 0dbed3a
Showing 1 changed file with 24 additions and 3 deletions.
27 changes: 24 additions & 3 deletions xen/arch/arm/tee/optee.c
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,15 @@ static bool optee_probe(void)
return true;
}

/*
* TODO: There is a potential issue with guests that either have RAM
* at IPA of 0x0 or some of their memory is mapped at PA 0x0. This is
* because PA of 0x0 is considered as NULL pointer by OP-TEE. It will
* not be able to map buffer with such pointer to TA address space, or
* use such buffer for communication with the guest. We either need to
* check that guest have no such mappings or ensure that OP-TEE
* enabled guest will not be created with such mappings.
*/
static int optee_domain_init(struct domain *d)
{
struct arm_smccc_res resp;
Expand Down Expand Up @@ -725,6 +734,15 @@ static int translate_noncontig(struct optee_domain *ctx,
uint64_t next_page_data;
} *guest_data, *xen_data;

/*
* Special case: a buffer with buf_ptr == 0x0 is considered as a
* NULL pointer by OP-TEE. No translation is needed. This can lead
* to an issue as IPA 0x0 is a valid address for Xen. See the
* comment near optee_domain_init()
*/
if ( !param->u.tmem.buf_ptr )
return 0;

/* Offset of user buffer withing OPTEE_MSG_NONCONTIG_PAGE_SIZE-sized page */
offset = param->u.tmem.buf_ptr & (OPTEE_MSG_NONCONTIG_PAGE_SIZE - 1);

Expand Down Expand Up @@ -865,9 +883,12 @@ static int translate_params(struct optee_domain *ctx,
}
else
{
gdprintk(XENLOG_WARNING, "Guest tries to use old tmem arg\n");
ret = -EINVAL;
goto out;
if ( call->xen_arg->params[i].u.tmem.buf_ptr )
{
gdprintk(XENLOG_WARNING, "Guest tries to use old tmem arg\n");
ret = -EINVAL;
goto out;
}
}
break;
case OPTEE_MSG_ATTR_TYPE_NONE:
Expand Down

0 comments on commit 0dbed3a

Please sign in to comment.