| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <CA+ddPcON2gBOsFk4KZS-tEFLKWxg6jH8Kf_xDObXMKbR=N+gzg@mail.gmail.com>
Date: Wed, 15 Nov 2023 15:23:06 -0800
From: Jeffrey Kardatzke <jkardatzke@...gle.com>
To: Yong Wu <yong.wu@...iatek.com>
Cc: Rob Herring <robh+dt@...nel.org>,
Sumit Semwal <sumit.semwal@...aro.org>,
christian.koenig@....com,
Matthias Brugger <matthias.bgg@...il.com>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
Conor Dooley <conor+dt@...nel.org>,
Benjamin Gaignard <benjamin.gaignard@...labora.com>,
Brian Starkey <Brian.Starkey@....com>,
John Stultz <jstultz@...gle.com>, tjmercier@...gle.com,
AngeloGioacchino Del Regno
<angelogioacchino.delregno@...labora.com>,
devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
linux-media@...r.kernel.org, dri-devel@...ts.freedesktop.org,
linaro-mm-sig@...ts.linaro.org,
linux-arm-kernel@...ts.infradead.org,
linux-mediatek@...ts.infradead.org, jianjiao.zeng@...iatek.com,
kuohong.wang@...iatek.com,
Vijayanand Jitta <quic_vjitta@...cinc.com>,
Joakim Bech <joakim.bech@...aro.org>,
Nicolas Dufresne <nicolas@...fresne.ca>,
ckoenig.leichtzumerken@...il.com
Subject: Re: [PATCH v2 3/8] dma-buf: heaps: secure_heap: Initialize tee session
Everything in this patch set should move into the MTK specific
implementation I suggested in patch 1 (secure_heap_mtk.c)
On Sat, Nov 11, 2023 at 3:17 AM Yong Wu <yong.wu@...iatek.com> wrote:
>
> The TEE probe later than dma-buf heap, and PROBE_DEDER doesn't work
> here since this is not a platform driver, therefore initialize the TEE
> context/session while we allocate the first secure buffer.
>
> Add our special UUID and tee type in the private data.
>
> If the uuid is zero, it means that it doesn't enter TEE to protect the
> buffer, there may be other ways to protect the buffer.
>
> All the MTK chrome projects use this UUID. The UUID is only used in the
> kernelspace while userspace never use it. The userspace could allocate the
> secure memory via the existing dma-buf ioctl.
>
> Signed-off-by: Yong Wu <yong.wu@...iatek.com>
> ---
> drivers/dma-buf/heaps/secure_heap.c | 75 +++++++++++++++++++++++++++++
> 1 file changed, 75 insertions(+)
>
> diff --git a/drivers/dma-buf/heaps/secure_heap.c b/drivers/dma-buf/heaps/secure_heap.c
> index 87ac23072e9e..2a037fc54004 100644
> --- a/drivers/dma-buf/heaps/secure_heap.c
> +++ b/drivers/dma-buf/heaps/secure_heap.c
> @@ -10,6 +10,12 @@
> #include <linux/err.h>
> #include <linux/module.h>
> #include <linux/slab.h>
> +#include <linux/tee_drv.h>
> +#include <linux/uuid.h>
> +
> +#define TZ_TA_MEM_UUID_MTK "4477588a-8476-11e2-ad15-e41f1390d676"
> +
> +#define TEE_PARAM_NUM 4
>
> enum secure_memory_type {
> /*
> @@ -27,6 +33,9 @@ struct secure_buffer {
> struct secure_heap;
>
> struct secure_heap_prv_data {
> + const char *uuid;
> + const int tee_impl_id;
> +
> int (*memory_alloc)(struct secure_heap *sec_heap, struct secure_buffer *sec_buf);
> void (*memory_free)(struct secure_heap *sec_heap, struct secure_buffer *sec_buf);
>
> @@ -39,9 +48,62 @@ struct secure_heap {
> const char *name;
> const enum secure_memory_type mem_type;
>
> + struct tee_context *tee_ctx;
> + u32 tee_session;
> +
> const struct secure_heap_prv_data *data;
> };
>
> +static int tee_ctx_match(struct tee_ioctl_version_data *ver, const void *data)
> +{
> + const struct secure_heap_prv_data *d = data;
> +
> + return ver->impl_id == d->tee_impl_id;
> +}
> +
> +static int secure_heap_tee_session_init(struct secure_heap *sec_heap)
> +{
> + struct tee_param t_param[TEE_PARAM_NUM] = {0};
> + struct tee_ioctl_open_session_arg arg = {0};
> + const struct secure_heap_prv_data *data = sec_heap->data;
> + uuid_t ta_mem_uuid;
> + int ret;
> +
> + sec_heap->tee_ctx = tee_client_open_context(NULL, tee_ctx_match, data, NULL);
> + if (IS_ERR(sec_heap->tee_ctx)) {
> + pr_err_once("%s: open context failed, ret=%ld\n", sec_heap->name,
> + PTR_ERR(sec_heap->tee_ctx));
> + return -ENODEV;
> + }
> +
> + arg.num_params = TEE_PARAM_NUM;
> + arg.clnt_login = TEE_IOCTL_LOGIN_PUBLIC;
> + ret = uuid_parse(data->uuid, &ta_mem_uuid);
> + if (ret)
> + goto close_context;
> + memcpy(&arg.uuid, &ta_mem_uuid.b, sizeof(ta_mem_uuid));
> +
> + ret = tee_client_open_session(sec_heap->tee_ctx, &arg, t_param);
> + if (ret < 0 || arg.ret) {
> + pr_err_once("%s: open session failed, ret=%d:%d\n",
> + sec_heap->name, ret, arg.ret);
> + ret = -EINVAL;
> + goto close_context;
> + }
> + sec_heap->tee_session = arg.session;
> + return 0;
> +
> +close_context:
> + tee_client_close_context(sec_heap->tee_ctx);
> + return ret;
> +}
> +
> +/* The memory allocating is within the TEE. */
> +const struct secure_heap_prv_data mtk_sec_mem_data = {
> + .uuid = TZ_TA_MEM_UUID_MTK,
> + .tee_impl_id = TEE_IMPL_ID_OPTEE,
> +};
> +
> static int secure_heap_secure_memory_allocate(struct secure_heap *sec_heap,
> struct secure_buffer *sec_buf)
> {
> @@ -84,11 +146,23 @@ secure_heap_allocate(struct dma_heap *heap, unsigned long size,
> unsigned long fd_flags, unsigned long heap_flags)
> {
> struct secure_heap *sec_heap = dma_heap_get_drvdata(heap);
> + const struct secure_heap_prv_data *data = sec_heap->data;
> struct secure_buffer *sec_buf;
> DEFINE_DMA_BUF_EXPORT_INFO(exp_info);
> struct dma_buf *dmabuf;
> int ret;
>
> + /*
> + * If uuid is valid, It requires enter TEE to protect buffers. However
> + * TEE probe may be late. Initialize the secure session the first time
> + * we request the secure buffer.
> + */
> + if (data->uuid && !sec_heap->tee_session) {
> + ret = secure_heap_tee_session_init(sec_heap);
> + if (ret)
> + return ERR_PTR(ret);
> + }
> +
> sec_buf = kzalloc(sizeof(*sec_buf), GFP_KERNEL);
> if (!sec_buf)
> return ERR_PTR(-ENOMEM);
> @@ -127,6 +201,7 @@ static struct secure_heap secure_heaps[] = {
> {
> .name = "secure_mtk_cm",
> .mem_type = SECURE_MEMORY_TYPE_MTK_CM_TZ,
> + .data = &mtk_sec_mem_data,
> },
> };
>
> --
> 2.25.1
>
Powered by blists - more mailing lists