tee: add tee_param_is_memref() for driver use (84debcc5) · Commits · 戴 / test

drivers/tee/tee_core.c

+2 −14

Original line number	Diff line number	Diff line
		@@ -221,18 +221,6 @@ static int params_to_user(struct tee_ioctl_param __user *uparams,
		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,
		struct tee_ioctl_buf_data __user *ubuf)
		{
		@@ -296,7 +284,7 @@ out:
		if (params) {
		/* Decrease ref count for all valid shared memory pointers */
		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)
		tee_shm_put(params[n].u.memref.shm);
		kfree(params);
		@@ -358,7 +346,7 @@ out:
		if (params) {
		/* Decrease ref count for all valid shared memory pointers */
		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)
		tee_shm_put(params[n].u.memref.shm);
		kfree(params);

+12 −0

Original line number	Diff line number	Diff line
		@@ -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);

		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/