tee/tee_shm.c: Fix error handling path
PATCH 1/1 tee/tee_shm.c: Fix error handling path
When shm->num_pages <= 0, we should avoid calling release_registered_pages() in error handling path.
--- drivers/tee/tee_shm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/tee/tee_shm.c +4 -3
@@ -260,8 +260,7 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, rc =get_kernel_pages (kiov, num_pages,0 , shm->pages);kfree (kiov); } -if (rc >0 ) - shm->num_pages = rc; + shm->num_pages = rc;if (rc != num_pages) {if (rc >=0 ) rc = -ENOMEM ;
@@ -309,7 +308,9 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr,idr_remove (&teedev->idr, shm->id);mutex_unlock (&teedev->mutex); } -release_registered_pages (shm); +if (shm->pages && (shm->num_pages >0 )) +release_registered_pages (shm); + }kfree (shm);teedev_ctx_put (ctx);
Signature · 1 line
1.9.1
Quoted 2 lines · Souptick Joarder
When
shm->num_pages<= 0, we should avoid callingrelease_registered_pages()in error handling path.
What are we fixing?
Quoted 12 lines
Signed-off-by Souptick Joarder <[email protected]>Cc John Hubbard <[email protected]>--- drivers/tee/tee_shm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/tee/tee_shm.c +0
-0
drivers/tee/tee_shm.c struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, · line 263
Quoted 6 lines
drivers/tee/tee_shm.c +1
-2@@ -260,8 +260,7 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, rc =get_kernel_pages (kiov, num_pages,0 , shm->pages);kfree (kiov); } -if (rc >0 ) - shm->num_pages = rc; + shm->num_pages = rc;
Why not avoiding assigning invalid values to shm->num_pages? By the way, shm->num_pages is a size_t.
drivers/tee/tee_shm.c struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, · line 313
Quoted 11 lines
drivers/tee/tee_shm.c +3
-1if (rc != num_pages) {if (rc >=0 ) rc = -ENOMEM ;@@ -309,7 +308,9 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr,idr_remove (&teedev->idr, shm->id);mutex_unlock (&teedev->mutex); } -release_registered_pages (shm); +if (shm->pages && (shm->num_pages >0 )) +release_registered_pages (shm); +
With this we'll leak if shm->pages has been assigned something.
Quoted 6 lines
drivers/tee/tee_shm.c +0
-0}kfree (shm);teedev_ctx_put (ctx);Signature · 1 line
1.9.1
Thanks,
Jens
Quoted 5 lines · Jens Wiklander
Quoted 2 lines · Souptick Joarder
When
shm->num_pages<= 0, we should avoid callingrelease_registered_pages()in error handling path.What are we fixing?
Current code is working fine and this patch is not needed. Sorry for the noise.
Quoted 39 lines
Quoted 13 lines
Signed-off-by Souptick Joarder <[email protected]>Cc John Hubbard <[email protected]>--- drivers/tee/tee_shm.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)drivers/tee/tee_shm.c +0
-0drivers/tee/tee_shm.c struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, · line 263
Quoted 6 lines
drivers/tee/tee_shm.c +1
-2@@ -260,8 +260,7 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, rc =get_kernel_pages (kiov, num_pages,0 , shm->pages);kfree (kiov); } -if (rc >0 ) - shm->num_pages = rc; + shm->num_pages = rc;Why not avoiding assigning invalid values to
shm->num_pages? By the way,shm->num_pagesis asize_t.drivers/tee/tee_shm.c struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr, · line 313
Quoted 11 lines
drivers/tee/tee_shm.c +3
-1if (rc != num_pages) {if (rc >=0 ) rc = -ENOMEM ;@@ -309,7 +308,9 @@ struct tee_shm *tee_shm_register(struct tee_context *ctx, unsigned long addr,idr_remove (&teedev->idr, shm->id);mutex_unlock (&teedev->mutex); } -release_registered_pages (shm); +if (shm->pages && (shm->num_pages >0 )) +release_registered_pages (shm); +With this we'll leak if
shm->pageshas been assigned something.Quoted 4 lines
drivers/tee/tee_shm.c +0
-1}kfree (shm);teedev_ctx_put (ctx); -