Skip to content

Commit 50a74d0

Browse files
Pei Xiaojenswi-linaro
authored andcommitted
tee: fix memory leak in tee_dyn_shm_alloc_helper
When shm_register() fails in tee_dyn_shm_alloc_helper(), the pre-allocated pages array is not freed, resulting in a memory leak. Fixes: cf44415 ("tee: optee: Move pool_op helper functions") Signed-off-by: Pei Xiao <[email protected]> Reviewed-by: Sumit Garg <[email protected]> Signed-off-by: Jens Wiklander <[email protected]>
1 parent e4a718a commit 50a74d0

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

drivers/tee/tee_shm.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ int tee_dyn_shm_alloc_helper(struct tee_shm *shm, size_t size, size_t align,
230230
pages = kcalloc(nr_pages, sizeof(*pages), GFP_KERNEL);
231231
if (!pages) {
232232
rc = -ENOMEM;
233-
goto err;
233+
goto err_pages;
234234
}
235235

236236
for (i = 0; i < nr_pages; i++)
@@ -243,11 +243,13 @@ int tee_dyn_shm_alloc_helper(struct tee_shm *shm, size_t size, size_t align,
243243
rc = shm_register(shm->ctx, shm, pages, nr_pages,
244244
(unsigned long)shm->kaddr);
245245
if (rc)
246-
goto err;
246+
goto err_kfree;
247247
}
248248

249249
return 0;
250-
err:
250+
err_kfree:
251+
kfree(pages);
252+
err_pages:
251253
free_pages_exact(shm->kaddr, shm->size);
252254
shm->kaddr = NULL;
253255
return rc;

0 commit comments

Comments
 (0)