On Wed, Jan 19, 2022 at 3:18 PM David Laight David.Laight@aculab.com wrote:

From: Jens Wiklander

...

Sent: 19 January 2022 08:08

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(-)

diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c index d8c8683863aa..d88bd2e41572 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(arg))
  

•         return PTR_ERR(arg);
  

What's this duplicate test for?

Oh, that's a copy & paste error, I should have tested rpc_arg here. I'll fix it in the V2.

Thanks, Jens

    David

Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK Registration No: 1397386 (Wales)