optee: Fix multi page dynamic shm pool alloc

optee_shm_register() expected pages to be passed as an array of page pointers rather than as an array of contiguous pages. So fix that via correctly passing pages as per expectation. Fixes: a249dd2 ("tee: optee: Fix dynamic shm pool allocations") Reported-by: Vincent Cao <[email protected]> Signed-off-by: Sumit Garg <[email protected]> Tested-by: Vincent Cao <[email protected]> Signed-off-by: Jens Wiklander <[email protected]>
fracktal · Jan 3, 2020 · 5a769f6 · 5a769f6
1 parent d1eef1c
commit 5a769f6
Showing 1 changed file with 14 additions and 1 deletion.
diff --git a/drivers/tee/optee/shm_pool.c b/drivers/tee/optee/shm_pool.c
@@ -28,9 +28,22 @@ static int pool_op_alloc(struct tee_shm_pool_mgr *poolm,
 	shm->size = PAGE_SIZE << order;
 
 	if (shm->flags & TEE_SHM_DMA_BUF) {
+		unsigned int nr_pages = 1 << order, i;
+		struct page **pages;
+
+		pages = kcalloc(nr_pages, sizeof(pages), GFP_KERNEL);
+		if (!pages)
+			return -ENOMEM;
+
+		for (i = 0; i < nr_pages; i++) {
+			pages[i] = page;
+			page++;
+		}
+
 		shm->flags |= TEE_SHM_REGISTER;
-		rc = optee_shm_register(shm->ctx, shm, &page, 1 << order,
+		rc = optee_shm_register(shm->ctx, shm, pages, nr_pages,
 					(unsigned long)shm->kaddr);
+		kfree(pages);
 	}
 
 	return rc;