projects
/
linux-2.6-microblaze.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'regulator-fix-v5.13-rc4' of git://git.kernel.org/pub/scm/linux/kernel...
[linux-2.6-microblaze.git]
/
drivers
/
tee
/
optee
/
call.c
diff --git
a/drivers/tee/optee/call.c
b/drivers/tee/optee/call.c
index
6132cc8
..
6e6eb83
100644
(file)
--- a/
drivers/tee/optee/call.c
+++ b/
drivers/tee/optee/call.c
@@
-220,6
+220,7
@@
int optee_open_session(struct tee_context *ctx,
struct optee_msg_arg *msg_arg;
phys_addr_t msg_parg;
struct optee_session *sess = NULL;
struct optee_msg_arg *msg_arg;
phys_addr_t msg_parg;
struct optee_session *sess = NULL;
+ uuid_t client_uuid;
/* +2 for the meta parameters added below */
shm = get_msg_arg(ctx, arg->num_params + 2, &msg_arg, &msg_parg);
/* +2 for the meta parameters added below */
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));
msg_arg->params[1].u.value.c = arg->clnt_login;
memcpy(&msg_arg->params[0].u.value, arg->uuid, sizeof(arg->uuid));
msg_arg->params[1].u.value.c = arg->clnt_login;
- rc = tee_session_calc_client_uuid(
(uuid_t *)&msg_arg->params[1].u.value
,
- arg->clnt_
login, arg->clnt_
uuid);
+ rc = tee_session_calc_client_uuid(
&client_uuid, arg->clnt_login
,
+ arg->clnt_uuid);
if (rc)
goto out;
if (rc)
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);
if (rc)
rc = optee_to_msg_param(msg_arg->params + 2, arg->num_params, param);
if (rc)