KEYS: trusted: tee: use tee_shm_register_kernel_buf()

Uses the new simplified tee_shm_register_kernel_buf() function instead
of the old tee_shm_alloc() function which required specific
TEE_SHM-flags

Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>

diff --git a/security/keys/trusted-keys/trusted_tee.c b/security/keys/trusted-keys/trusted_tee.c
index 2ce66c199e1d773b3e6518132926ceb86bae937c..c8626686ee1b72045adaafa373336c2f62a2651d 100644 (file)
--- a/security/keys/trusted-keys/trusted_tee.c
+++ b/security/keys/trusted-keys/trusted_tee.c
@@ -70,17 +70,15 @@ static int trusted_tee_seal(struct trusted_key_payload *p, char *datablob)
        memset(&inv_arg, 0, sizeof(inv_arg));
        memset(&param, 0, sizeof(param));
 
-       reg_shm_in = tee_shm_register(pvt_data.ctx, (unsigned long)p->key,
-                                     p->key_len, TEE_SHM_DMA_BUF |
-                                     TEE_SHM_KERNEL_MAPPED);
+       reg_shm_in = tee_shm_register_kernel_buf(pvt_data.ctx, p->key,
+                                                p->key_len);
        if (IS_ERR(reg_shm_in)) {
                dev_err(pvt_data.dev, "key shm register failed\n");
                return PTR_ERR(reg_shm_in);
        }
 
-       reg_shm_out = tee_shm_register(pvt_data.ctx, (unsigned long)p->blob,
-                                      sizeof(p->blob), TEE_SHM_DMA_BUF |
-                                      TEE_SHM_KERNEL_MAPPED);
+       reg_shm_out = tee_shm_register_kernel_buf(pvt_data.ctx, p->blob,
+                                                 sizeof(p->blob));
        if (IS_ERR(reg_shm_out)) {
                dev_err(pvt_data.dev, "blob shm register failed\n");
                ret = PTR_ERR(reg_shm_out);
@@ -131,17 +129,15 @@ static int trusted_tee_unseal(struct trusted_key_payload *p, char *datablob)
        memset(&inv_arg, 0, sizeof(inv_arg));
        memset(&param, 0, sizeof(param));
 
-       reg_shm_in = tee_shm_register(pvt_data.ctx, (unsigned long)p->blob,
-                                     p->blob_len, TEE_SHM_DMA_BUF |
-                                     TEE_SHM_KERNEL_MAPPED);
+       reg_shm_in = tee_shm_register_kernel_buf(pvt_data.ctx, p->blob,
+                                                p->blob_len);
        if (IS_ERR(reg_shm_in)) {
                dev_err(pvt_data.dev, "blob shm register failed\n");
                return PTR_ERR(reg_shm_in);
        }
 
-       reg_shm_out = tee_shm_register(pvt_data.ctx, (unsigned long)p->key,
-                                      sizeof(p->key), TEE_SHM_DMA_BUF |
-                                      TEE_SHM_KERNEL_MAPPED);
+       reg_shm_out = tee_shm_register_kernel_buf(pvt_data.ctx, p->key,
+                                                 sizeof(p->key));
        if (IS_ERR(reg_shm_out)) {
                dev_err(pvt_data.dev, "key shm register failed\n");
                ret = PTR_ERR(reg_shm_out);
@@ -192,8 +188,7 @@ static int trusted_tee_get_random(unsigned char *key, size_t key_len)
        memset(&inv_arg, 0, sizeof(inv_arg));
        memset(&param, 0, sizeof(param));
 
-       reg_shm = tee_shm_register(pvt_data.ctx, (unsigned long)key, key_len,
-                                  TEE_SHM_DMA_BUF | TEE_SHM_KERNEL_MAPPED);
+       reg_shm = tee_shm_register_kernel_buf(pvt_data.ctx, key, key_len);
        if (IS_ERR(reg_shm)) {
                dev_err(pvt_data.dev, "key shm register failed\n");
                return PTR_ERR(reg_shm);