* [PATCH] tee: fix memory leak in tee_dyn_shm_alloc_helper
@ 2025-07-23 6:22 Pei Xiao
2025-07-29 9:27 ` Sumit Garg
2025-07-29 16:54 ` Markus Elfring
0 siblings, 2 replies; 4+ messages in thread
From: Pei Xiao @ 2025-07-23 6:22 UTC (permalink / raw)
To: jens.wiklander, sumit.garg, balint.dobszay, op-tee, linux-kernel; +Cc: Pei Xiao
When shm_register() fails in tee_dyn_shm_alloc_helper(), the pre-allocated
pages array is not freed, resulting in a memory leak.
Fixes: cf4441503e20 ("tee: optee: Move pool_op helper functions")
Signed-off-by: Pei Xiao <xiaopei01@kylinos.cn>
---
drivers/tee/tee_shm.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
index 915239b033f5..2a7d253d9c55 100644
--- a/drivers/tee/tee_shm.c
+++ b/drivers/tee/tee_shm.c
@@ -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;
--
2.25.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] tee: fix memory leak in tee_dyn_shm_alloc_helper
2025-07-23 6:22 [PATCH] tee: fix memory leak in tee_dyn_shm_alloc_helper Pei Xiao
@ 2025-07-29 9:27 ` Sumit Garg
2025-08-04 15:49 ` Jens Wiklander
2025-07-29 16:54 ` Markus Elfring
1 sibling, 1 reply; 4+ messages in thread
From: Sumit Garg @ 2025-07-29 9:27 UTC (permalink / raw)
To: Pei Xiao; +Cc: jens.wiklander, balint.dobszay, op-tee, linux-kernel
On Wed, Jul 23, 2025 at 02:22:41PM +0800, Pei Xiao wrote:
> When shm_register() fails in tee_dyn_shm_alloc_helper(), the pre-allocated
> pages array is not freed, resulting in a memory leak.
>
> Fixes: cf4441503e20 ("tee: optee: Move pool_op helper functions")
> Signed-off-by: Pei Xiao <xiaopei01@kylinos.cn>
> ---
> drivers/tee/tee_shm.c | 8 +++++---
> 1 file changed, 5 insertions(+), 3 deletions(-)
Reviewed-by: Sumit Garg <sumit.garg@oss.qualcomm.com>
-Sumit
>
> diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
> index 915239b033f5..2a7d253d9c55 100644
> --- a/drivers/tee/tee_shm.c
> +++ b/drivers/tee/tee_shm.c
> @@ -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;
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] tee: fix memory leak in tee_dyn_shm_alloc_helper
2025-07-29 9:27 ` Sumit Garg
@ 2025-08-04 15:49 ` Jens Wiklander
0 siblings, 0 replies; 4+ messages in thread
From: Jens Wiklander @ 2025-08-04 15:49 UTC (permalink / raw)
To: Sumit Garg; +Cc: Pei Xiao, balint.dobszay, op-tee, linux-kernel
On Tue, Jul 29, 2025 at 11:27 AM Sumit Garg <sumit.garg@kernel.org> wrote:
>
> On Wed, Jul 23, 2025 at 02:22:41PM +0800, Pei Xiao wrote:
> > When shm_register() fails in tee_dyn_shm_alloc_helper(), the pre-allocated
> > pages array is not freed, resulting in a memory leak.
> >
> > Fixes: cf4441503e20 ("tee: optee: Move pool_op helper functions")
> > Signed-off-by: Pei Xiao <xiaopei01@kylinos.cn>
> > ---
> > drivers/tee/tee_shm.c | 8 +++++---
> > 1 file changed, 5 insertions(+), 3 deletions(-)
>
> Reviewed-by: Sumit Garg <sumit.garg@oss.qualcomm.com>
Looks good. I'm picking up this.
Thanks,
Jens
>
> -Sumit
>
> >
> > diff --git a/drivers/tee/tee_shm.c b/drivers/tee/tee_shm.c
> > index 915239b033f5..2a7d253d9c55 100644
> > --- a/drivers/tee/tee_shm.c
> > +++ b/drivers/tee/tee_shm.c
> > @@ -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;
> > --
> > 2.25.1
> >
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] tee: fix memory leak in tee_dyn_shm_alloc_helper
2025-07-23 6:22 [PATCH] tee: fix memory leak in tee_dyn_shm_alloc_helper Pei Xiao
2025-07-29 9:27 ` Sumit Garg
@ 2025-07-29 16:54 ` Markus Elfring
1 sibling, 0 replies; 4+ messages in thread
From: Markus Elfring @ 2025-07-29 16:54 UTC (permalink / raw)
To: Pei Xiao, op-tee; +Cc: LKML, Balint Dobszay, Jens Wiklander, Sumit Garg
> When shm_register() fails in tee_dyn_shm_alloc_helper(), the pre-allocated
> pages array is not freed, resulting in a memory leak.
See also:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.16#n94
Regards,
Markus
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-08-04 15:49 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-07-23 6:22 [PATCH] tee: fix memory leak in tee_dyn_shm_alloc_helper Pei Xiao
2025-07-29 9:27 ` Sumit Garg
2025-08-04 15:49 ` Jens Wiklander
2025-07-29 16:54 ` Markus Elfring
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox