Commit ec185dd3 authored by Tyler Hicks's avatar Tyler Hicks Committed by Jens Wiklander
Browse files

optee: Fix memory leak when failing to register shm pages 



Free the previously allocated pages when we encounter an error condition
while attempting to register the pages with the secure world.

Fixes: a249dd20 ("tee: optee: Fix dynamic shm pool allocations")
Fixes: 5a769f6f ("optee: Fix multi page dynamic shm pool alloc")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarTyler Hicks <tyhicks@linux.microsoft.com>
Reviewed-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: default avatarSumit Garg <sumit.garg@linaro.org>
Signed-off-by: default avatarJens Wiklander <jens.wiklander@linaro.org>
parent 2734d6c1

drivers/tee/optee/shm_pool.c

+10 −2
Original line number Diff line number Diff line
@@ -32,8 +32,10 @@ static int pool_op_alloc(struct tee_shm_pool_mgr *poolm, 
		struct page **pages;



		pages = kcalloc(nr_pages, sizeof(pages), GFP_KERNEL);

		if (!pages)

			return -ENOMEM;

		if (!pages) {

			rc = -ENOMEM;

			goto err;

		}



		for (i = 0; i < nr_pages; i++) {

			pages[i] = page;
@@ -44,8 +46,14 @@ static int pool_op_alloc(struct tee_shm_pool_mgr *poolm, 
		rc = optee_shm_register(shm->ctx, shm, pages, nr_pages,

					(unsigned long)shm->kaddr);

		kfree(pages);

		if (rc)

			goto err;

	}



	return 0;



err:

	__free_pages(page, order);

	return rc;

}