Skip to content

Commit

Permalink
tee: optee: Fix incorrect page free bug
Browse files Browse the repository at this point in the history
Pointer to the allocated pages (struct page *page) has already
progressed towards the end of allocation. It is incorrect to perform
__free_pages(page, order) using this pointer as we would free any
arbitrary pages. Fix this by stop modifying the page pointer.

Fixes: ec185dd ("optee: Fix memory leak when failing to register shm pages")
Cc: stable@vger.kernel.org
Reported-by: Patrik Lantz <patrik.lantz@axis.com>
Signed-off-by: Sumit Garg <sumit.garg@linaro.org>
Reviewed-by: Tyler Hicks <tyhicks@linux.microsoft.com>
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
  • Loading branch information
b49020 authored and jenswi-linaro committed Dec 16, 2021
1 parent dfd0743 commit 18549bf
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions drivers/tee/optee/core.c
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,8 @@ int optee_pool_op_alloc_helper(struct tee_shm_pool_mgr *poolm,
goto err;
}

for (i = 0; i < nr_pages; i++) {
pages[i] = page;
page++;
}
for (i = 0; i < nr_pages; i++)
pages[i] = page + i;

shm->flags |= TEE_SHM_REGISTER;
rc = shm_register(shm->ctx, shm, pages, nr_pages,
Expand Down

0 comments on commit 18549bf

Please sign in to comment.