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

tee: add tee_shm_register_{user,kernel}_buf()

Browse Source 
Adds the two new functions tee_shm_register_user_buf() and
tee_shm_register_kernel_buf() which should be used instead of the old
tee_shm_register().

This avoids having the caller supplying the flags parameter which
exposes a bit more than desired of the internals of the TEE subsystem.

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:56 +01:00
parent 924e322692
commit 056d3fed3d
4 changed files with 38 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/tee/tee_core.c
View File

@ -334,8 +334,7 @@ tee_ioctl_shm_register(struct tee_context *ctx,
if (data.flags)
return -EINVAL;
shm = tee_shm_register(ctx, data.addr, data.length,
TEE_SHM_DMA_BUF | TEE_SHM_USER_MAPPED);
shm = tee_shm_register_user_buf(ctx, data.addr, data.length);
if (IS_ERR(shm))
return PTR_ERR(shm);

2
drivers/tee/tee_private.h
View File

@ -58,5 +58,7 @@ void teedev_ctx_get(struct tee_context *ctx);
void teedev_ctx_put(struct tee_context *ctx);
struct tee_shm *tee_shm_alloc_user_buf(struct tee_context *ctx, size_t size);
struct tee_shm *tee_shm_register_user_buf(struct tee_context *ctx,
unsigned long addr, size_t length);
#endif /*TEE_PRIVATE_H*/

33
drivers/tee/tee_shm.c
View File

@ -299,6 +299,39 @@ err:
}
EXPORT_SYMBOL_GPL(tee_shm_register);
/**
* tee_shm_register_user_buf() - Register a userspace shared memory buffer
* @ctx: Context that registers the shared memory
* @addr: The userspace address of the shared buffer
* @length: Length of the shared buffer
*
* @returns a pointer to 'struct tee_shm'
*/
struct tee_shm *tee_shm_register_user_buf(struct tee_context *ctx,
unsigned long addr, size_t length)
{
return tee_shm_register(ctx, addr, length,
TEE_SHM_DMA_BUF | TEE_SHM_USER_MAPPED);
}
/**
* tee_shm_register_kernel_buf() - Register kernel memory to be shared with
* secure world
* @ctx: Context that registers the shared memory
* @addr: The buffer
* @length: Length of the buffer
*
* @returns a pointer to 'struct tee_shm'
*/
struct tee_shm *tee_shm_register_kernel_buf(struct tee_context *ctx,
void *addr, size_t length)
{
return tee_shm_register(ctx, (unsigned long)addr, length,
TEE_SHM_DMA_BUF | TEE_SHM_KERNEL_MAPPED);
}
EXPORT_SYMBOL_GPL(tee_shm_register_kernel_buf);
static int tee_shm_fop_release(struct inode *inode, struct file *filp)
{
tee_shm_put(filp->private_data);

2
include/linux/tee_drv.h
View File

@ -287,6 +287,8 @@ struct tee_shm *tee_shm_alloc_kernel_buf(struct tee_context *ctx, size_t size);
*/
struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr,
size_t length, u32 flags);
struct tee_shm *tee_shm_register_kernel_buf(struct tee_context *ctx,
void *addr, size_t length);
/**
* tee_shm_is_registered() - Check if shared memory object in registered in TEE