renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-21 11:44:01 +08:00
Code

optee: use export_uuid() to copy client UUID

Browse Source 
Prior to this patch optee_open_session() was making assumptions about
the internal format of uuid_t by casting a memory location in a
parameter struct to uuid_t *. Fix this using export_uuid() to get a well
defined binary representation and also add an octets field in struct
optee_msg_param in order to avoid casting.

Fixes: c5b4312bea ("tee: optee: Add support for session login client UUID generation")
Suggested-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
This commit is contained in:
Jens Wiklander 2021-04-19 18:46:30 +02:00
parent 6efb943b86
commit 673c7aa243
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/tee/optee/call.c
View File

@ -220,6 +220,7 @@ int optee_open_session(struct tee_context *ctx,
struct optee_msg_arg *msg_arg; struct optee_msg_arg *msg_arg;
phys_addr_t msg_parg; phys_addr_t msg_parg;
struct optee_session *sess = NULL; struct optee_session *sess = NULL;
uuid_t client_uuid;
/* +2 for the meta parameters added below */ /* +2 for the meta parameters added below */
shm = get_msg_arg(ctx, arg->num_params + 2, &msg_arg, &msg_parg); shm = get_msg_arg(ctx, arg->num_params + 2, &msg_arg, &msg_parg);
@ -240,10 +241,11 @@ int optee_open_session(struct tee_context *ctx,
memcpy(&msg_arg->params[0].u.value, arg->uuid, sizeof(arg->uuid)); memcpy(&msg_arg->params[0].u.value, arg->uuid, sizeof(arg->uuid));
msg_arg->params[1].u.value.c = arg->clnt_login; msg_arg->params[1].u.value.c = arg->clnt_login;
rc = tee_session_calc_client_uuid((uuid_t *)&msg_arg->params[1].u.value, rc = tee_session_calc_client_uuid(&client_uuid, arg->clnt_login,
arg->clnt_login, arg->clnt_uuid); arg->clnt_uuid);
if (rc) if (rc)
goto out; goto out;
export_uuid(msg_arg->params[1].u.octets, &client_uuid);
rc = optee_to_msg_param(msg_arg->params + 2, arg->num_params, param); rc = optee_to_msg_param(msg_arg->params + 2, arg->num_params, param);
if (rc) if (rc)

6
drivers/tee/optee/optee_msg.h
View File

@ -9,7 +9,7 @@
#include <linux/types.h> #include <linux/types.h>
/* /*
* This file defines the OP-TEE message protocol used to communicate * This file defines the OP-TEE message protocol (ABI) used to communicate
* with an instance of OP-TEE running in secure world. * with an instance of OP-TEE running in secure world.
* *
* This file is divided into two sections. * This file is divided into two sections.
@ -144,9 +144,10 @@ struct optee_msg_param_value {
* @tmem: parameter by temporary memory reference * @tmem: parameter by temporary memory reference
* @rmem: parameter by registered memory reference * @rmem: parameter by registered memory reference
* @value: parameter by opaque value * @value: parameter by opaque value
* @octets: parameter by octet string
* *
* @attr & OPTEE_MSG_ATTR_TYPE_MASK indicates if tmem, rmem or value is used in * @attr & OPTEE_MSG_ATTR_TYPE_MASK indicates if tmem, rmem or value is used in
* the union. OPTEE_MSG_ATTR_TYPE_VALUE_* indicates value, * the union. OPTEE_MSG_ATTR_TYPE_VALUE_* indicates value or octets,
* OPTEE_MSG_ATTR_TYPE_TMEM_* indicates @tmem and * OPTEE_MSG_ATTR_TYPE_TMEM_* indicates @tmem and
* OPTEE_MSG_ATTR_TYPE_RMEM_* indicates @rmem, * OPTEE_MSG_ATTR_TYPE_RMEM_* indicates @rmem,
* OPTEE_MSG_ATTR_TYPE_NONE indicates that none of the members are used. * OPTEE_MSG_ATTR_TYPE_NONE indicates that none of the members are used.
@ -157,6 +158,7 @@ struct optee_msg_param {
struct optee_msg_param_tmem tmem; struct optee_msg_param_tmem tmem;
struct optee_msg_param_rmem rmem; struct optee_msg_param_rmem rmem;
struct optee_msg_param_value value; struct optee_msg_param_value value;
u8 octets[24];
} u; } u;
}; };