linux-kernel - Re: [PATCH] tee: fix memory leak in tee_dyn_shm_alloc

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <CAHUa44ExoWcNXVDiwUA02qEhiCFF0obeXYJY4_NEVUTzEvkUng@mail.gmail.com>
Date: Mon, 4 Aug 2025 17:49:27 +0200
From: Jens Wiklander <jens.wiklander@...aro.org>
To: Sumit Garg <sumit.garg@...nel.org>
Cc: Pei Xiao <xiaopei01@...inos.cn>, balint.dobszay@....com, 
	op-tee@...ts.trustedfirmware.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] tee: fix memory leak in tee_dyn_shm_alloc_helper

On Tue, Jul 29, 2025 at 11:27 AM Sumit Garg <sumit.garg@...nel.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@...inos.cn>
> > ---
> >  drivers/tee/tee_shm.c | 8 +++++---
> >  1 file changed, 5 insertions(+), 3 deletions(-)
>
> Reviewed-by: Sumit Garg <sumit.garg@....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
> >