diff options
| author |   Olof Johansson <olof@lixom.net> | 2018-01-11 18:05:06 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2018-01-11 18:05:06 -0800 |
| commit | ffdc98c4f25b1f4fb96cd9190917b53a760f3fec (patch) | |
| tree | 7bb4bb58ac4efa60c4263e72394557e39c74ec02 /drivers/tee/optee/optee_private.h | |
| parent | bus: omap: add MODULE_LICENSE tags (diff) | |
| parent | tee: shm: Potential NULL dereference calling tee_shm_register() (diff) | |
| download | linux-dev-ffdc98c4f25b1f4fb96cd9190917b53a760f3fec.tar.xz linux-dev-ffdc98c4f25b1f4fb96cd9190917b53a760f3fec.zip | |
Merge tag 'tee-drv-dynamic-shm+fixes-for-v4.16' of https://git.linaro.org/people/jens.wiklander/linux-tee into next/drivers
This pull request updates the previous tee-drv-dynamic-shm-for-v4.16 pull
request with five new patches fixing review comments and errors.
Apart from three small fixes there's two larger patches that in the end
checks that memory to be registered really is normal cached memory.
* tag 'tee-drv-dynamic-shm+fixes-for-v4.16' of https://git.linaro.org/people/jens.wiklander/linux-tee:
tee: shm: Potential NULL dereference calling tee_shm_register()
tee: shm: don't put_page on null shm->pages
tee: shm: make function __tee_shm_alloc static
tee: optee: check type of registered shared memory
tee: add start argument to shm_register callback
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'drivers/tee/optee/optee_private.h')
| -rw-r--r-- | drivers/tee/optee/optee_private.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/tee/optee/optee_private.h b/drivers/tee/optee/optee_private.h index a85a24725e31..35e79386c556 100644 --- a/drivers/tee/optee/optee_private.h +++ b/drivers/tee/optee/optee_private.h @@ -162,11 +162,13 @@ void optee_enable_shm_cache(struct optee *optee); void optee_disable_shm_cache(struct optee *optee); int optee_shm_register(struct tee_context *ctx, struct tee_shm *shm, - struct page **pages, size_t num_pages); + struct page **pages, size_t num_pages, + unsigned long start); int optee_shm_unregister(struct tee_context *ctx, struct tee_shm *shm); int optee_shm_register_supp(struct tee_context *ctx, struct tee_shm *shm, - struct page **pages, size_t num_pages); + struct page **pages, size_t num_pages, + unsigned long start); int optee_shm_unregister_supp(struct tee_context *ctx, struct tee_shm *shm); int optee_from_msg_param(struct tee_param *params, size_t num_params, |