github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-02 03:24:19 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

Fix OP-TEE multi page dynamic shm pool alloc

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQJOBAABCgA4FiEEcK3MsDvGvFp6zV9ztbC4QZeP7NMFAl4PFdwaHGplbnMud2lr
 bGFuZGVyQGxpbmFyby5vcmcACgkQtbC4QZeP7NPzEA//WzZBt+vsTuN2QUOyBlnO
 09VoFbQbzdoHbtSwk8vPkLimq6v02V0fnfTXUcXIh9pzx4j7hp+lFEydzXzckJU0
 558b3U4n1Z1eayrf+PRjqpmX/Imt0L5LrcEDRRI+PCkEsdFsevDZjS3WnKWIfqaW
 6s5rfJ3GOac3kAMpxWjOqaILkT8all4+0NwhevGT1dQfGWnrc+STicJoeMKiRlix
 2kinR3cLrVizTO3kZpFnqLiKHzEGSMLfjRRsdlaLvqF5g/MSeYbdDDeE/FsyQSjY
 ltTjhdUdCI112wpKLn6Pz1BMhdNwPRbTEFEp2qoP9e23GfMTTupt6zsBT0mC5sxj
 BFlRqlUpk5/ySzS4KE1EnZCET3TLVkCxqw6ehVKwnsKPqkmekTClVWkJnQw02Syh
 +j6nj106xl/hLTNU8oEu1SZoMS1iWn4PEFB0w3gm3QnsTzxuElJW6E1osjCbmA7A
 JFPxlOhXNnj5uVk/dAbdjW5DVhLzIemmw//wrRTQ8zCu4/xtbG/wvlBKt6QoOmXf
 1lo09bSSsTBHvPVa71wIBMfZnHuzHUIIkspsJzI7Zc2QZOsqTThKmFlH7xw8ewwM
 MKpFydaqkuj85Eab6CPg8e3ddr3tWULJOD8ZpG+oRf31T6nzpPP2pIrZzWatToMN
 HSKMf+hcEqMz3oFn2e5CuF0=
 =JYQm
 -----END PGP SIGNATURE-----

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: Olof Johansson <olof@lixom.net>
This commit is contained in:
Olof Johansson 2020-01-06 09:20:40 -08:00
commit 850e0a9936
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/tee/optee/shm_pool.c
View File

@ -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;