Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <20220120074232.1084967-1-jens.wiklander@linaro.org> <CAFA6WYO=9Rw7R+QEgunjtdM=63L1AzYxx26452=+uj7SuPiE7Q@mail.gmail.com>
In-Reply-To: <CAFA6WYO=9Rw7R+QEgunjtdM=63L1AzYxx26452=+uj7SuPiE7Q@mail.gmail.com>
From:   Jens Wiklander <jens.wiklander@linaro.org>
Date:   Mon, 24 Jan 2022 12:54:56 +0100
Message-ID: <CAHUa44Gtwwx4+8QS9UiVGp+2FnZuPjFnZaZ+_Tt8VJnq308gQA@mail.gmail.com>
Subject: Re: [PATCH v2] optee: add error checks in optee_ffa_do_call_with_arg()
To:     Sumit Garg <sumit.garg@linaro.org>
Cc:     linux-kernel@vger.kernel.org, op-tee@lists.trustedfirmware.org,
        David Laight <david.laight@aculab.com>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Thu, Jan 20, 2022 at 12:18 PM Sumit Garg <sumit.garg@linaro.org> wrote:
>
> On Thu, 20 Jan 2022 at 13:12, Jens Wiklander <jens.wiklander@linaro.org> wrote:
> >
> > Adds error checking in optee_ffa_do_call_with_arg() for correctness.
> >
> > Fixes: 4615e5a34b95 ("optee: add FF-A support")
> > Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
> > ---
> >  drivers/tee/optee/ffa_abi.c | 15 ++++++++++++---
> >  1 file changed, 12 insertions(+), 3 deletions(-)
> >
>
> Reviewed-by: Sumit Garg <sumit.garg@linaro.org>

I'm picking up this.

Thanks,
Jens

>
> -Sumit
>
> > diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
> > index 20a1b1a3d965..0775759a29c0 100644
> > --- a/drivers/tee/optee/ffa_abi.c
> > +++ b/drivers/tee/optee/ffa_abi.c
> > @@ -619,9 +619,18 @@ static int optee_ffa_do_call_with_arg(struct tee_context *ctx,
> >                 .data2 = (u32)(shm->sec_world_id >> 32),
> >                 .data3 = shm->offset,
> >         };
> > -       struct optee_msg_arg *arg = tee_shm_get_va(shm, 0);
> > -       unsigned int rpc_arg_offs = OPTEE_MSG_GET_ARG_SIZE(arg->num_params);
> > -       struct optee_msg_arg *rpc_arg = tee_shm_get_va(shm, rpc_arg_offs);
> > +       struct optee_msg_arg *arg;
> > +       unsigned int rpc_arg_offs;
> > +       struct optee_msg_arg *rpc_arg;
> > +
> > +       arg = tee_shm_get_va(shm, 0);
> > +       if (IS_ERR(arg))
> > +               return PTR_ERR(arg);
> > +
> > +       rpc_arg_offs = OPTEE_MSG_GET_ARG_SIZE(arg->num_params);
> > +       rpc_arg = tee_shm_get_va(shm, rpc_arg_offs);
> > +       if (IS_ERR(rpc_arg))
> > +               return PTR_ERR(rpc_arg);
> >
> >         return optee_ffa_yielding_call(ctx, &data, rpc_arg);
> >  }
> > --
> > 2.31.1
> >