Commit f1bbaced authored by Jens Wiklander's avatar Jens Wiklander
Browse files

tee: don't assign shm id for private shms 



Private shared memory object must not be referenced from user space. To
guarantee that, don't assign an id to shared memory objects which are
driver private.

Signed-off-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
parent c180f9bb

drivers/tee/tee_private.h

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ struct tee_shm_pool { 
 * @num_users:	number of active users of this device

 * @c_no_user:	completion used when unregistering the device

 * @mutex:	mutex protecting @num_users and @idr

 * @idr:	register of shared memory object allocated on this device

 * @idr:	register of user space shared memory objects allocated or

 *		registered on this device

 * @pool:	shared memory pool

 */

struct tee_device {

drivers/tee/tee_shm.c

+18 −13
Original line number Diff line number Diff line
@@ -15,9 +15,11 @@ static void tee_shm_release(struct tee_shm *shm) 
{

	struct tee_device *teedev = shm->teedev;



	if (shm->flags & TEE_SHM_DMA_BUF) {

		mutex_lock(&teedev->mutex);

		idr_remove(&teedev->idr, shm->id);

		mutex_unlock(&teedev->mutex);

	}



	if (shm->flags & TEE_SHM_POOL) {

		struct tee_shm_pool_mgr *poolm;
@@ -137,6 +139,10 @@ struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags) 
		goto err_kfree;

	}





	if (flags & TEE_SHM_DMA_BUF) {

		DEFINE_DMA_BUF_EXPORT_INFO(exp_info);



		mutex_lock(&teedev->mutex);

		shm->id = idr_alloc(&teedev->idr, shm, 1, 0, GFP_KERNEL);

		mutex_unlock(&teedev->mutex);
@@ -145,9 +151,6 @@ struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags) 
			goto err_pool_free;

		}



	if (flags & TEE_SHM_DMA_BUF) {

		DEFINE_DMA_BUF_EXPORT_INFO(exp_info);



		exp_info.ops = &tee_shm_dma_buf_ops;

		exp_info.size = shm->size;

		exp_info.flags = O_RDWR;
@@ -165,9 +168,11 @@ struct tee_shm *tee_shm_alloc(struct tee_context *ctx, size_t size, u32 flags) 


	return shm;

err_rem:

	if (flags & TEE_SHM_DMA_BUF) {

		mutex_lock(&teedev->mutex);

		idr_remove(&teedev->idr, shm->id);

		mutex_unlock(&teedev->mutex);

	}

err_pool_free:

	poolm->ops->free(poolm, shm);

err_kfree: