From: Jens Wiklander To: op-tee@lists.trustedfirmware.org Subject: [PATCH] optee: add error checks in optee_ffa_do_call_with_arg() Date: Wed, 19 Jan 2022 09:07:36 +0100 Message-ID: <20220119080736.2940906-1-jens.wiklander@linaro.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============3832738149640532368==" List-Id: --===============3832738149640532368== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Adds error checking in optee_ffa_do_call_with_arg() for correctness. Fixes: 4615e5a34b95 ("optee: add FF-A support") Signed-off-by: Jens Wiklander --- 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 =3D (u32)(shm->sec_world_id >> 32), .data3 =3D shm->offset, }; - struct optee_msg_arg *arg =3D tee_shm_get_va(shm, 0); - unsigned int rpc_arg_offs =3D OPTEE_MSG_GET_ARG_SIZE(arg->num_params); - struct optee_msg_arg *rpc_arg =3D 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 =3D tee_shm_get_va(shm, 0); + if (IS_ERR(arg)) + return PTR_ERR(arg); + + rpc_arg_offs =3D OPTEE_MSG_GET_ARG_SIZE(arg->num_params); + rpc_arg =3D tee_shm_get_va(shm, rpc_arg_offs); + if (IS_ERR(arg)) + return PTR_ERR(arg); =20 return optee_ffa_yielding_call(ctx, &data, rpc_arg); } --=20 2.31.1 --===============3832738149640532368==--