2022-03-17 03:23:54

by Dongliang Mu

Subject: [PATCH] tee: optee: add missing mutext_destroy in optee_ffa_probe

From: Dongliang Mu <[email protected]>

The error handling code of optee_ffa_probe misses the mutex_destroy of
ffa.mutex when mutext_init succeeds.

Fix this by adding mutex_destory of ffa.mutex at the error handling part

Fixes: aceeafefff73 ("optee: use driver internal tee_context for some rpc")
Signed-off-by: Dongliang Mu <[email protected]>
---
drivers/tee/optee/ffa_abi.c | 1 +
1 file changed, 1 insertion(+)

diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
index f744ab15bf2c..30a6119a2b16 100644
--- a/drivers/tee/optee/ffa_abi.c
+++ b/drivers/tee/optee/ffa_abi.c
@@ -894,6 +894,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
rhashtable_free_and_destroy(&optee->ffa.global_ids, rh_free_fn, NULL);
optee_supp_uninit(&optee->supp);
mutex_destroy(&optee->call_queue.mutex);
+ mutex_destroy(&optee->ffa.mutex);
err_unreg_supp_teedev:
tee_device_unregister(optee->supp_teedev);
err_unreg_teedev:
--
2.25.1

2022-03-25 04:40:44

by Jens Wiklander

Subject: Re: [PATCH] tee: optee: add missing mutext_destroy in optee_ffa_probe

On Wed, Mar 16, 2022 at 2:51 PM Dongliang Mu <[email protected]> wrote:
>
> From: Dongliang Mu <[email protected]>
>
> The error handling code of optee_ffa_probe misses the mutex_destroy of
> ffa.mutex when mutext_init succeeds.
>
> Fix this by adding mutex_destory of ffa.mutex at the error handling part
>
> Fixes: aceeafefff73 ("optee: use driver internal tee_context for some rpc")

I believe this should be
Fixes: 4615e5a34b95 ("optee: add FF-A support")
don't you agree?

Thanks,
Jens

> Signed-off-by: Dongliang Mu <[email protected]>
> ---
> drivers/tee/optee/ffa_abi.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
> index f744ab15bf2c..30a6119a2b16 100644
> --- a/drivers/tee/optee/ffa_abi.c
> +++ b/drivers/tee/optee/ffa_abi.c
> @@ -894,6 +894,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
> rhashtable_free_and_destroy(&optee->ffa.global_ids, rh_free_fn, NULL);
> optee_supp_uninit(&optee->supp);
> mutex_destroy(&optee->call_queue.mutex);
> + mutex_destroy(&optee->ffa.mutex);
> err_unreg_supp_teedev:
> tee_device_unregister(optee->supp_teedev);
> err_unreg_teedev:
> --
> 2.25.1
>

2022-03-25 14:35:23

by Dongliang Mu

Subject: Re: [PATCH] tee: optee: add missing mutext_destroy in optee_ffa_probe

On Thu, Mar 24, 2022 at 4:29 PM Jens Wiklander
<[email protected]> wrote:
>
> On Wed, Mar 16, 2022 at 2:51 PM Dongliang Mu <[email protected]> wrote:
> >
> > From: Dongliang Mu <[email protected]>
> >
> > The error handling code of optee_ffa_probe misses the mutex_destroy of
> > ffa.mutex when mutext_init succeeds.
> >
> > Fix this by adding mutex_destory of ffa.mutex at the error handling part
> >
> > Fixes: aceeafefff73 ("optee: use driver internal tee_context for some rpc")
>
> I believe this should be
> Fixes: 4615e5a34b95 ("optee: add FF-A support")
> don't you agree?

Hi Jen,

This commit 4615e5a34b95 is more suitable since mutex_init is introduced here.

Why did I label the commit aceeafefff73?

Because this commit tried to fix the issue, but only added one
mutex_destroy for &optee->call_queue.mutex, misses &optee->ffa.mutex.

>
> Thanks,
> Jens
>
> > Signed-off-by: Dongliang Mu <[email protected]>
> > ---
> > drivers/tee/optee/ffa_abi.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
> > index f744ab15bf2c..30a6119a2b16 100644
> > --- a/drivers/tee/optee/ffa_abi.c
> > +++ b/drivers/tee/optee/ffa_abi.c
> > @@ -894,6 +894,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
> > rhashtable_free_and_destroy(&optee->ffa.global_ids, rh_free_fn, NULL);
> > optee_supp_uninit(&optee->supp);
> > mutex_destroy(&optee->call_queue.mutex);
> > + mutex_destroy(&optee->ffa.mutex);
> > err_unreg_supp_teedev:
> > tee_device_unregister(optee->supp_teedev);
> > err_unreg_teedev:
> > --
> > 2.25.1
> >

2022-04-02 16:58:28

by Dongliang Mu

Subject: Re: [PATCH] tee: optee: add missing mutext_destroy in optee_ffa_probe

On Thu, Mar 24, 2022 at 5:33 PM Dongliang Mu <[email protected]> wrote:
>
> On Thu, Mar 24, 2022 at 4:29 PM Jens Wiklander
> <[email protected]> wrote:
> >
> > On Wed, Mar 16, 2022 at 2:51 PM Dongliang Mu <[email protected]> wrote:
> > >
> > > From: Dongliang Mu <[email protected]>
> > >
> > > The error handling code of optee_ffa_probe misses the mutex_destroy of
> > > ffa.mutex when mutext_init succeeds.
> > >
> > > Fix this by adding mutex_destory of ffa.mutex at the error handling part
> > >
> > > Fixes: aceeafefff73 ("optee: use driver internal tee_context for some rpc")
> >
> > I believe this should be
> > Fixes: 4615e5a34b95 ("optee: add FF-A support")
> > don't you agree?
>
> Hi Jen,
>
> This commit 4615e5a34b95 is more suitable since mutex_init is introduced here.
>
> Why did I label the commit aceeafefff73?
>
> Because this commit tried to fix the issue, but only added one
> mutex_destroy for &optee->call_queue.mutex, misses &optee->ffa.mutex.
>

ping?

> >
> > Thanks,
> > Jens
> >
> > > Signed-off-by: Dongliang Mu <[email protected]>
> > > ---
> > > drivers/tee/optee/ffa_abi.c | 1 +
> > > 1 file changed, 1 insertion(+)
> > >
> > > diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
> > > index f744ab15bf2c..30a6119a2b16 100644
> > > --- a/drivers/tee/optee/ffa_abi.c
> > > +++ b/drivers/tee/optee/ffa_abi.c
> > > @@ -894,6 +894,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
> > > rhashtable_free_and_destroy(&optee->ffa.global_ids, rh_free_fn, NULL);
> > > optee_supp_uninit(&optee->supp);
> > > mutex_destroy(&optee->call_queue.mutex);
> > > + mutex_destroy(&optee->ffa.mutex);
> > > err_unreg_supp_teedev:
> > > tee_device_unregister(optee->supp_teedev);
> > > err_unreg_teedev:
> > > --
> > > 2.25.1
> > >

2022-04-05 07:48:19

by Jens Wiklander

Subject: Re: [PATCH] tee: optee: add missing mutext_destroy in optee_ffa_probe

On Fri, Apr 1, 2022 at 4:00 AM Dongliang Mu <[email protected]> wrote:
>
> On Thu, Mar 24, 2022 at 5:33 PM Dongliang Mu <[email protected]> wrote:
> >
> > On Thu, Mar 24, 2022 at 4:29 PM Jens Wiklander
> > <[email protected]> wrote:
> > >
> > > On Wed, Mar 16, 2022 at 2:51 PM Dongliang Mu <[email protected]> wrote:
> > > >
> > > > From: Dongliang Mu <[email protected]>
> > > >
> > > > The error handling code of optee_ffa_probe misses the mutex_destroy of
> > > > ffa.mutex when mutext_init succeeds.
> > > >
> > > > Fix this by adding mutex_destory of ffa.mutex at the error handling part
> > > >
> > > > Fixes: aceeafefff73 ("optee: use driver internal tee_context for some rpc")
> > >
> > > I believe this should be
> > > Fixes: 4615e5a34b95 ("optee: add FF-A support")
> > > don't you agree?
> >
> > Hi Jen,
> >
> > This commit 4615e5a34b95 is more suitable since mutex_init is introduced here.
> >
> > Why did I label the commit aceeafefff73?
> >
> > Because this commit tried to fix the issue, but only added one
> > mutex_destroy for &optee->call_queue.mutex, misses &optee->ffa.mutex.
> >
>
> ping?

I'm picking up this.

Thanks,
Jens