Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-14 08:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

efi_loader: Extra checks while opening an OPTEE session

Browse source 
When opening an OP-TEE session we need to check the internal return
value of OP-TEE call arguments as well the return code of the
function itself.
The code was also ignoring to close the OP-TEE session in case the
shared memory registration failed.

Fixes: f042e47e8f ("efi_loader: Implement EFI variable handling via OP-TEE")
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
This commit is contained in:
Ilias Apalodimas 2020-12-23 13:25:00 +02:00 committed by Heinrich Schuchardt
parent fbc326244c
commit 548fb67eef
1 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/efi_loader/efi_variable_tee.c
View file

@ -36,20 +36,29 @@ static int get_connection(struct mm_connection *conn)
static const struct tee_optee_ta_uuid uuid = PTA_STMM_UUID; static const struct tee_optee_ta_uuid uuid = PTA_STMM_UUID;
struct udevice *tee = NULL; struct udevice *tee = NULL;
struct tee_open_session_arg arg; struct tee_open_session_arg arg;
int rc; int rc = -ENODEV;
tee = tee_find_device(tee, NULL, NULL, NULL); tee = tee_find_device(tee, NULL, NULL, NULL);
if (!tee) if (!tee)
return -ENODEV; goto out;
memset(&arg, 0, sizeof(arg)); memset(&arg, 0, sizeof(arg));
tee_optee_ta_uuid_to_octets(arg.uuid, &uuid); tee_optee_ta_uuid_to_octets(arg.uuid, &uuid);
rc = tee_open_session(tee, &arg, 0, NULL); rc = tee_open_session(tee, &arg, 0, NULL);
if (!rc) { if (rc)
conn->tee = tee; goto out;
conn->session = arg.session;
/* Check the internal OP-TEE result */
if (arg.ret != TEE_SUCCESS) {
rc = -EIO;
goto out;
} }
conn->tee = tee;
conn->session = arg.session;
return 0;
out:
return rc; return rc;
} }
@ -88,6 +97,7 @@ static efi_status_t optee_mm_communicate(void *comm_buf, ulong dsize)
if (tee_shm_register(conn.tee, comm_buf, buf_size, 0, &shm)) { if (tee_shm_register(conn.tee, comm_buf, buf_size, 0, &shm)) {
log_err("Unable to register shared memory\n"); log_err("Unable to register shared memory\n");
tee_close_session(conn.tee, conn.session);
return EFI_UNSUPPORTED; return EFI_UNSUPPORTED;
} }