leandrof/u-boot
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge tag 'efi-2021-01-rc5' of https://gitlab.denx.de/u-boot/custodians/u-boot-efi

Browse Source 
Pull request for UEFI sub-system for efi-2021-01-rc5

* In the Standalone MM based implementation of UEFI variables
  check the internal OP-TEE return code
This commit is contained in:
Tom Rini
2020-12-26 08:02:19 -05:00
parent fbc326244c 548fb67eef
commit e426e2d936
1 changed files with 15 additions and 5 deletions
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;
} }