diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-04-01 21:01:18 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2021-04-01 21:01:18 +0200 |
| commit | d6358a687891dacbe7d88541a83f61bdccb4f7b8 (patch) | |
| tree | e56635df9c48ece8bc8096f374ffa8ec9572c0c3 | |
| parent | Merge tag 'omap-for-v5.13/ti-sysc-signed' of git://git.kernel.org/pub/scm/lin... (diff) | |
| parent | tee: optee: do not check memref size on return from Secure World (diff) | |
| download | linux-d6358a687891dacbe7d88541a83f61bdccb4f7b8.tar.xz linux-d6358a687891dacbe7d88541a83f61bdccb4f7b8.zip | |
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>
| -rw-r--r-- | drivers/tee/optee/core.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/tee/optee/core.c b/drivers/tee/optee/core.c index cf4718c6d35d..63542c1cc291 100644 --- a/drivers/tee/optee/core.c +++ b/drivers/tee/optee/core.c @@ -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: |