From: Jens Wiklander <jens.wiklander@linaro.org>
To: linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org
Cc: Sumit Garg <sumit.garg@linaro.org>,
Herbert Xu <herbert@gondor.apana.org.au>,
Devaraj Rangasamy <Devaraj.Rangasamy@amd.com>,
Rijo Thomas <Rijo-john.Thomas@amd.com>,
David Howells <dhowells@redhat.com>,
Tyler Hicks <tyhicks@linux.microsoft.com>,
Jens Wiklander <jens.wiklander@linaro.org>
Subject: [PATCH v3 10/12] KEYS: trusted: tee: use tee_shm_register_kernel_buf()
Date: Tue, 25 Jan 2022 17:29:36 +0100 [thread overview]
Message-ID: <20220125162938.838382-11-jens.wiklander@linaro.org> (raw)
In-Reply-To: <20220125162938.838382-1-jens.wiklander@linaro.org>
Uses the new simplified tee_shm_register_kernel_buf() function instead
of the old tee_shm_alloc() function which required specific
TEE_SHM-flags
Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
---
security/keys/trusted-keys/trusted_tee.c | 23 +++++++++--------------
1 file changed, 9 insertions(+), 14 deletions(-)
diff --git a/security/keys/trusted-keys/trusted_tee.c b/security/keys/trusted-keys/trusted_tee.c
index 2ce66c199e1d..c8626686ee1b 100644
--- a/security/keys/trusted-keys/trusted_tee.c
+++ b/security/keys/trusted-keys/trusted_tee.c
@@ -70,17 +70,15 @@ static int trusted_tee_seal(struct trusted_key_payload *p, char *datablob)
memset(&inv_arg, 0, sizeof(inv_arg));
memset(¶m, 0, sizeof(param));
- reg_shm_in = tee_shm_register(pvt_data.ctx, (unsigned long)p->key,
- p->key_len, TEE_SHM_DMA_BUF |
- TEE_SHM_KERNEL_MAPPED);
+ reg_shm_in = tee_shm_register_kernel_buf(pvt_data.ctx, p->key,
+ p->key_len);
if (IS_ERR(reg_shm_in)) {
dev_err(pvt_data.dev, "key shm register failed\n");
return PTR_ERR(reg_shm_in);
}
- reg_shm_out = tee_shm_register(pvt_data.ctx, (unsigned long)p->blob,
- sizeof(p->blob), TEE_SHM_DMA_BUF |
- TEE_SHM_KERNEL_MAPPED);
+ reg_shm_out = tee_shm_register_kernel_buf(pvt_data.ctx, p->blob,
+ sizeof(p->blob));
if (IS_ERR(reg_shm_out)) {
dev_err(pvt_data.dev, "blob shm register failed\n");
ret = PTR_ERR(reg_shm_out);
@@ -131,17 +129,15 @@ static int trusted_tee_unseal(struct trusted_key_payload *p, char *datablob)
memset(&inv_arg, 0, sizeof(inv_arg));
memset(¶m, 0, sizeof(param));
- reg_shm_in = tee_shm_register(pvt_data.ctx, (unsigned long)p->blob,
- p->blob_len, TEE_SHM_DMA_BUF |
- TEE_SHM_KERNEL_MAPPED);
+ reg_shm_in = tee_shm_register_kernel_buf(pvt_data.ctx, p->blob,
+ p->blob_len);
if (IS_ERR(reg_shm_in)) {
dev_err(pvt_data.dev, "blob shm register failed\n");
return PTR_ERR(reg_shm_in);
}
- reg_shm_out = tee_shm_register(pvt_data.ctx, (unsigned long)p->key,
- sizeof(p->key), TEE_SHM_DMA_BUF |
- TEE_SHM_KERNEL_MAPPED);
+ reg_shm_out = tee_shm_register_kernel_buf(pvt_data.ctx, p->key,
+ sizeof(p->key));
if (IS_ERR(reg_shm_out)) {
dev_err(pvt_data.dev, "key shm register failed\n");
ret = PTR_ERR(reg_shm_out);
@@ -192,8 +188,7 @@ static int trusted_tee_get_random(unsigned char *key, size_t key_len)
memset(&inv_arg, 0, sizeof(inv_arg));
memset(¶m, 0, sizeof(param));
- reg_shm = tee_shm_register(pvt_data.ctx, (unsigned long)key, key_len,
- TEE_SHM_DMA_BUF | TEE_SHM_KERNEL_MAPPED);
+ reg_shm = tee_shm_register_kernel_buf(pvt_data.ctx, key, key_len);
if (IS_ERR(reg_shm)) {
dev_err(pvt_data.dev, "key shm register failed\n");
return PTR_ERR(reg_shm);
--
2.31.1
next prev parent reply other threads:[~2022-01-25 16:36 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-01-25 16:29 [PATCH v3 00/12] tee: shared memory updates Jens Wiklander
2022-01-25 16:29 ` [PATCH v3 01/12] hwrng: optee-rng: use tee_shm_alloc_kernel_buf() Jens Wiklander
2022-01-25 16:29 ` [PATCH v3 02/12] tee: remove unused tee_shm_pool_alloc_res_mem() Jens Wiklander
2022-01-25 16:29 ` [PATCH v3 03/12] tee: add tee_shm_alloc_user_buf() Jens Wiklander
2022-01-27 5:56 ` Sumit Garg
2022-01-27 8:09 ` Jens Wiklander
2022-01-25 16:29 ` [PATCH v3 04/12] tee: simplify shm pool handling Jens Wiklander
2022-01-27 6:09 ` Sumit Garg
2022-01-27 8:27 ` Jens Wiklander
2022-01-25 16:29 ` [PATCH v3 05/12] tee: replace tee_shm_alloc() Jens Wiklander
2022-01-27 6:16 ` Sumit Garg
2022-01-27 8:31 ` Jens Wiklander
2022-01-25 16:29 ` [PATCH v3 06/12] optee: add driver private tee_context Jens Wiklander
2022-01-27 6:24 ` Sumit Garg
2022-01-25 16:29 ` [PATCH v3 07/12] optee: use driver internal tee_contex for some rpc Jens Wiklander
2022-01-27 6:32 ` Sumit Garg
2022-01-27 12:39 ` Jens Wiklander
2022-01-25 16:29 ` [PATCH v3 08/12] optee: add optee_pool_op_free_helper() Jens Wiklander
2022-01-25 16:29 ` [PATCH v3 09/12] tee: add tee_shm_register_{user,kernel}_buf() Jens Wiklander
2022-01-27 6:35 ` Sumit Garg
2022-01-25 16:29 ` Jens Wiklander [this message]
2022-01-25 16:29 ` [PATCH v3 11/12] tee: replace tee_shm_register() Jens Wiklander
2022-01-27 6:59 ` Sumit Garg
2022-01-27 13:00 ` Jens Wiklander
2022-01-25 16:29 ` [PATCH v3 12/12] tee: refactor TEE_SHM_* flags Jens Wiklander
2022-01-27 7:05 ` Sumit Garg
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220125162938.838382-11-jens.wiklander@linaro.org \
--to=jens.wiklander@linaro.org \
--cc=Devaraj.Rangasamy@amd.com \
--cc=Rijo-john.Thomas@amd.com \
--cc=dhowells@redhat.com \
--cc=herbert@gondor.apana.org.au \
--cc=linux-kernel@vger.kernel.org \
--cc=op-tee@lists.trustedfirmware.org \
--cc=sumit.garg@linaro.org \
--cc=tyhicks@linux.microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).