Commit 3c712f14 authored Jun 14, 2021 by Tyler Hicks Committed by Greg Kroah-Hartman Aug 12, 2021

optee: Fix memory leak when failing to register shm pages



commit ec185dd3ab257dc2a60953fdf1b6622f524cc5b7 upstream.

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

Fixes: a249dd200d03 ("tee: optee: Fix dynamic shm pool allocations")
Fixes: 5a769f6ff439 ("optee: Fix multi page dynamic shm pool alloc")
Cc: stable@vger.kernel.org
Signed-off-by: Tyler Hicks <tyhicks@linux.microsoft.com>
Reviewed-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Sumit Garg <sumit.garg@linaro.org>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent 0572199b

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