+ Jarkko (Apologies I accidently missed you while sending the original patch).
On Thu, 10 Nov 2022 at 16:42, Sumit Garg <sumit.garg@xxxxxxxxxx> wrote:
>
> 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@xxxxxxxxxx>
> Tested-by: Jerome Forissier <jerome.forissier@xxxxxxxxxx>
> ---
> security/keys/trusted-keys/trusted_tee.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/security/keys/trusted-keys/trusted_tee.c b/security/keys/trusted-keys/trusted_tee.c
> index c8626686ee1b..ac3e270ade69 100644
> --- a/security/keys/trusted-keys/trusted_tee.c
> +++ b/security/keys/trusted-keys/trusted_tee.c
> @@ -219,7 +219,8 @@ static int trusted_tee_get_random(unsigned char *key, size_t key_len)
>
> static int optee_ctx_match(struct tee_ioctl_version_data *ver, const void *data)
> {
> - if (ver->impl_id == TEE_IMPL_ID_OPTEE)
> + if (ver->impl_id == TEE_IMPL_ID_OPTEE &&
> + ver->gen_caps & TEE_GEN_CAP_REG_MEM)
> return 1;
> else
> return 0;
> --
> 2.34.1
>
