OP-TEE: update optee_linuxdriver to match updated optee_os & optee_client

[firefly-linux-kernel-4.4.55.git] / security / optee_linuxdriver / core / tee_kernel_api.c

diff --git a/security/optee_linuxdriver/core/tee_kernel_api.c b/security/optee_linuxdriver/core/tee_kernel_api.c
index 9da7bc80ad67bfbce887648c323bafc24dbc726e..3b4380faf3b1fa5cc7941e4f67f51ebd92198694 100644 (file)
--- a/security/optee_linuxdriver/core/tee_kernel_api.c
+++ b/security/optee_linuxdriver/core/tee_kernel_api.c
@@ -28,6 +28,7 @@
 
 static void reset_tee_cmd(struct tee_cmd_io *cmd)
 {
+       memset(cmd, 0, sizeof(struct tee_cmd_io));
        cmd->fd_sess = -1;
        cmd->cmd = 0;
        cmd->uuid = NULL;
@@ -230,7 +231,7 @@ TEEC_Result TEEC_AllocateSharedMemory(TEEC_Context *context,
        shm = (struct tee_shm *)(long)shm_io.fd_shm;
        shared_memory->buffer = shm->kaddr;
 
-       pr_debug("%s(%zd) => fd=%d, kaddr=%p\n", __func__,
+       pr_debug("%s(%d) => fd=%d, kaddr=%p\n", __func__,
                 shm_io.size, shm_io.fd_shm, (void *)shared_memory->buffer);
 
        return TEEC_SUCCESS;