Merge tag 'tee-optee-fix-for-5.5' of... (850e0a99) · Commits · 戴 / test

Merge tag 'tee-optee-fix-for-5.5' of git://git.linaro.org:/people/jens.wiklander/linux-tee into arm/fixes Fix OP-TEE multi page dynamic shm pool alloc * tag 'tee-optee-fix-for-5.5' of git://git.linaro.org:/people/jens.wiklander/linux-tee: optee: Fix multi page dynamic shm pool alloc Link: https://lore.kernel.org/r/20200103103710.GA3469@jax Signed-off-by:

drivers/tee/optee/shm_pool.c

+14 −1

Original line number	Diff line number	Diff line
		@@ -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;