lkml.org 
[lkml]   [2022]   [Mar]   [31]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] tee: optee: add missing mutext_destroy in optee_ffa_probe
On Thu, Mar 24, 2022 at 5:33 PM Dongliang Mu <mudongliangabcd@gmail.com> wrote:
>
> On Thu, Mar 24, 2022 at 4:29 PM Jens Wiklander
> <jens.wiklander@linaro.org> wrote:
> >
> > On Wed, Mar 16, 2022 at 2:51 PM Dongliang Mu <dzm91@hust.edu.cn> wrote:
> > >
> > > From: Dongliang Mu <mudongliangabcd@gmail.com>
> > >
> > > 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 <mudongliangabcd@gmail.com>
> > > ---
> > > 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
> > >

\
 
 \ /
  Last update: 2022-04-01 04:02    [W:0.048 / U:0.328 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site