Skip to content

Commit 1506fba

Browse files
b49020jarkkojs
authored andcommitted
KEYS: trusted: tee: Make registered shm dependency explicit
TEE trusted keys support depends on registered shared memory support since the key buffers are needed to be registered with OP-TEE. So make that dependency explicit to not register trusted keys support if underlying implementation doesn't support registered shared memory. Signed-off-by: Sumit Garg <sumit.garg@linaro.org> Tested-by: Jerome Forissier <jerome.forissier@linaro.org> Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org> Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
1 parent e10de46 commit 1506fba

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

security/keys/trusted-keys/trusted_tee.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,8 @@ static int trusted_tee_get_random(unsigned char *key, size_t key_len)
219219

220220
static int optee_ctx_match(struct tee_ioctl_version_data *ver, const void *data)
221221
{
222-
if (ver->impl_id == TEE_IMPL_ID_OPTEE)
222+
if (ver->impl_id == TEE_IMPL_ID_OPTEE &&
223+
ver->gen_caps & TEE_GEN_CAP_REG_MEM)
223224
return 1;
224225
else
225226
return 0;

0 commit comments

Comments
 (0)