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 /include/linux/tee_drv.h | |
| parent | be60566ea9b07c61c1b3cc586a95c1927cdaf3fb (diff) | |
| parent | 2490cdf6435b1d3cac0dbf710cd752487c67c296 (diff) | |
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 'include/linux/tee_drv.h')
| -rw-r--r-- | include/linux/tee_drv.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/tee_drv.h b/include/linux/tee_drv.h index 41bd4bded28c..a2b3dfcee0b5 100644 --- a/include/linux/tee_drv.h +++ b/include/linux/tee_drv.h @@ -108,7 +108,8 @@ struct tee_driver_ops { int (*supp_send)(struct tee_context *ctx, u32 ret, u32 num_params, struct tee_param *param); int (*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 (*shm_unregister)(struct tee_context *ctx, struct tee_shm *shm); }; |