Commit 056d3fed authored by Jens Wiklander's avatar Jens Wiklander
Browse files

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



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: default avatarSumit Garg <sumit.garg@linaro.org>
Signed-off-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
parent 924e3226

drivers/tee/tee_core.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

drivers/tee/tee_private.h

+2 −0
Original line number Diff line number Diff line
@@ -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*/

drivers/tee/tee_shm.c

+33 −0
Original line number Diff line number Diff line
@@ -299,6 +299,39 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, 
}

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);

include/linux/tee_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -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