iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

KEYS: trusted: tee: use tee_shm_register_kernel_buf()

Browse Source 
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>
This commit is contained in:
Jens Wiklander
2022-02-04 10:33:57 +01:00
parent 056d3fed3d
commit 231b1fc5da
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
security/keys/trusted-keys/trusted_tee.c
View File

@@ -70,17 +70,15 @@ static int trusted_tee_seal(struct trusted_key_payload *p, char *datablob)
memset(&inv_arg, 0, sizeof(inv_arg)); memset(&inv_arg, 0, sizeof(inv_arg));
memset(&param, 0, sizeof(param)); memset(&param, 0, sizeof(param));
reg_shm_in = tee_shm_register(pvt_data.ctx, (unsigned long)p->key, reg_shm_in = tee_shm_register_kernel_buf(pvt_data.ctx, p->key,
p->key_len, TEE_SHM_DMA_BUF | p->key_len);
TEE_SHM_KERNEL_MAPPED);
if (IS_ERR(reg_shm_in)) { if (IS_ERR(reg_shm_in)) {
dev_err(pvt_data.dev, "key shm register failed\n"); dev_err(pvt_data.dev, "key shm register failed\n");
return PTR_ERR(reg_shm_in); return PTR_ERR(reg_shm_in);
} }
reg_shm_out = tee_shm_register(pvt_data.ctx, (unsigned long)p->blob, reg_shm_out = tee_shm_register_kernel_buf(pvt_data.ctx, p->blob,
sizeof(p->blob), TEE_SHM_DMA_BUF | sizeof(p->blob));
TEE_SHM_KERNEL_MAPPED);
if (IS_ERR(reg_shm_out)) { if (IS_ERR(reg_shm_out)) {
dev_err(pvt_data.dev, "blob shm register failed\n"); dev_err(pvt_data.dev, "blob shm register failed\n");
ret = PTR_ERR(reg_shm_out); 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(&inv_arg, 0, sizeof(inv_arg));
memset(&param, 0, sizeof(param)); memset(&param, 0, sizeof(param));
reg_shm_in = tee_shm_register(pvt_data.ctx, (unsigned long)p->blob, reg_shm_in = tee_shm_register_kernel_buf(pvt_data.ctx, p->blob,
p->blob_len, TEE_SHM_DMA_BUF | p->blob_len);
TEE_SHM_KERNEL_MAPPED);
if (IS_ERR(reg_shm_in)) { if (IS_ERR(reg_shm_in)) {
dev_err(pvt_data.dev, "blob shm register failed\n"); dev_err(pvt_data.dev, "blob shm register failed\n");
return PTR_ERR(reg_shm_in); return PTR_ERR(reg_shm_in);
} }
reg_shm_out = tee_shm_register(pvt_data.ctx, (unsigned long)p->key, reg_shm_out = tee_shm_register_kernel_buf(pvt_data.ctx, p->key,
sizeof(p->key), TEE_SHM_DMA_BUF | sizeof(p->key));
TEE_SHM_KERNEL_MAPPED);
if (IS_ERR(reg_shm_out)) { if (IS_ERR(reg_shm_out)) {
dev_err(pvt_data.dev, "key shm register failed\n"); dev_err(pvt_data.dev, "key shm register failed\n");
ret = PTR_ERR(reg_shm_out); 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(&inv_arg, 0, sizeof(inv_arg));
memset(&param, 0, sizeof(param)); memset(&param, 0, sizeof(param));
reg_shm = tee_shm_register(pvt_data.ctx, (unsigned long)key, key_len, reg_shm = tee_shm_register_kernel_buf(pvt_data.ctx, key, key_len);
TEE_SHM_DMA_BUF | TEE_SHM_KERNEL_MAPPED);
if (IS_ERR(reg_shm)) { if (IS_ERR(reg_shm)) {
dev_err(pvt_data.dev, "key shm register failed\n"); dev_err(pvt_data.dev, "key shm register failed\n");
return PTR_ERR(reg_shm); return PTR_ERR(reg_shm);