evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

BACKPORT: tee: add tee_param_is_memref() for driver use

Browse source 
Change-Id: I105eb7c113b68695c28123f520d8d9b07a1fcda4
Reviewed-by: Etienne Carriere <etienne.carriere@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
(cherry picked from commit 84debcc53533f162bf11f24e6a503d227c175cbe)
Signed-off-by: Victor Chong <victor.chong@linaro.org>
This commit is contained in:
Jens Wiklander 2016-12-23 13:13:27 +01:00 • committed by Victor Chong
parent 014c9019a2
commit fb96bdaa3a
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
drivers/tee/tee_core.c
View file

@ -221,18 +221,6 @@ static int params_to_user(struct tee_ioctl_param __user *uparams,
return 0; return 0;
} }
static bool param_is_memref(struct tee_param *param)
{
switch (param->attr & TEE_IOCTL_PARAM_ATTR_TYPE_MASK) {
case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT:
case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT:
case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT:
return true;
default:
return false;
}
}
static int tee_ioctl_open_session(struct tee_context *ctx, static int tee_ioctl_open_session(struct tee_context *ctx,
struct tee_ioctl_buf_data __user *ubuf) struct tee_ioctl_buf_data __user *ubuf)
{ {
@ -296,7 +284,7 @@ out:
if (params) { if (params) {
/* Decrease ref count for all valid shared memory pointers */ /* Decrease ref count for all valid shared memory pointers */
for (n = 0; n < arg.num_params; n++) for (n = 0; n < arg.num_params; n++)
if (param_is_memref(params + n) && if (tee_param_is_memref(params + n) &&
params[n].u.memref.shm) params[n].u.memref.shm)
tee_shm_put(params[n].u.memref.shm); tee_shm_put(params[n].u.memref.shm);
kfree(params); kfree(params);
@ -358,7 +346,7 @@ out:
if (params) { if (params) {
/* Decrease ref count for all valid shared memory pointers */ /* Decrease ref count for all valid shared memory pointers */
for (n = 0; n < arg.num_params; n++) for (n = 0; n < arg.num_params; n++)
if (param_is_memref(params + n) && if (tee_param_is_memref(params + n) &&
params[n].u.memref.shm) params[n].u.memref.shm)
tee_shm_put(params[n].u.memref.shm); tee_shm_put(params[n].u.memref.shm);
kfree(params); kfree(params);

12
include/linux/tee_drv.h
View file

@ -275,4 +275,16 @@ int tee_shm_get_id(struct tee_shm *shm);
*/ */
struct tee_shm *tee_shm_get_from_id(struct tee_context *ctx, int id); struct tee_shm *tee_shm_get_from_id(struct tee_context *ctx, int id);
static inline bool tee_param_is_memref(struct tee_param *param)
{
switch (param->attr & TEE_IOCTL_PARAM_ATTR_TYPE_MASK) {
case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INPUT:
case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_OUTPUT:
case TEE_IOCTL_PARAM_ATTR_TYPE_MEMREF_INOUT:
return true;
default:
return false;
}
}
#endif /*__TEE_DRV_H*/ #endif /*__TEE_DRV_H*/