Commit 50a74d00 authored by Pei Xiao's avatar Pei Xiao Committed by Jens Wiklander
Browse files

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: cf444150 ("tee: optee: Move pool_op helper functions")
Signed-off-by: default avatarPei Xiao <xiaopei01@kylinos.cn>
Reviewed-by: default avatarSumit Garg <sumit.garg@oss.qualcomm.com>
Signed-off-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
parent e4a718a3

drivers/tee/tee_shm.c

+5 −3
Original line number Diff line number Diff line
@@ -230,7 +230,7 @@ int tee_dyn_shm_alloc_helper(struct tee_shm *shm, size_t size, size_t align, 
	pages = kcalloc(nr_pages, sizeof(*pages), GFP_KERNEL);

	if (!pages) {

		rc = -ENOMEM;

		goto err;

		goto err_pages;

	}



	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, 
		rc = shm_register(shm->ctx, shm, pages, nr_pages,

				  (unsigned long)shm->kaddr);

		if (rc)

			goto err;

			goto err_kfree;

	}



	return 0;

err:

err_kfree:

	kfree(pages);

err_pages:

	free_pages_exact(shm->kaddr, shm->size);

	shm->kaddr = NULL;

	return rc;