Commit d6358a68 authored Apr 01, 2021 by Arnd Bergmann

Merge tag 'optee-memref-size-for-v5.13' of...

Merge tag 'optee-memref-size-for-v5.13' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/drivers

OP-TEE skip check of returned memref size

* tag 'optee-memref-size-for-v5.13' of git://git.linaro.org/people/jens.wiklander/linux-tee:
  tee: optee: do not check memref size on return from Secure World

Link: https://lore.kernel.org/r/20210330110037.GA1166563@jade


Signed-off-by: Arnd Bergmann <arnd@arndb.de>

parents 1d79dca6 c650b8dc

drivers/tee/optee/core.c

+0 −10

Original line number	Diff line number	Diff line
		@@ -79,16 +79,6 @@ int optee_from_msg_param(struct tee_param *params, size_t num_params,
		return rc;
		p->u.memref.shm_offs = mp->u.tmem.buf_ptr - pa;
		p->u.memref.shm = shm;

		/* Check that the memref is covered by the shm object */
		if (p->u.memref.size) {
		size_t o = p->u.memref.shm_offs +
		p->u.memref.size - 1;

		rc = tee_shm_get_pa(shm, o, NULL);
		if (rc)
		return rc;
		}
		break;
		case OPTEE_MSG_ATTR_TYPE_RMEM_INPUT:
		case OPTEE_MSG_ATTR_TYPE_RMEM_OUTPUT: