* [PATCH -next] tee: optee: fix error return code in probe function
@ 2022-02-10 9:10 Yang Yingliang
2022-02-14 11:48 ` Jens Wiklander
0 siblings, 1 reply; 2+ messages in thread
From: Yang Yingliang @ 2022-02-10 9:10 UTC (permalink / raw)
To: linux-kernel, op-tee; +Cc: jens.wiklander, sumit.garg
If teedev_open() fails, probe function need return
error code.
Fixes: aceeafefff73 ("optee: use driver internal tee_context for some rpc")
Reported-by: Hulk Robot <hulkci@huawei.com>
Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
---
drivers/tee/optee/ffa_abi.c | 4 +++-
drivers/tee/optee/smc_abi.c | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
index f2bf6c61197f..f744ab15bf2c 100644
--- a/drivers/tee/optee/ffa_abi.c
+++ b/drivers/tee/optee/ffa_abi.c
@@ -869,8 +869,10 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
optee_supp_init(&optee->supp);
ffa_dev_set_drvdata(ffa_dev, optee);
ctx = teedev_open(optee->teedev);
- if (IS_ERR(ctx))
+ if (IS_ERR(ctx)) {
+ rc = PTR_ERR(ctx);
goto err_rhashtable_free;
+ }
optee->ctx = ctx;
rc = optee_notif_init(optee, OPTEE_DEFAULT_MAX_NOTIF_VALUE);
if (rc)
diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
index 1a55339c7072..c517d310249f 100644
--- a/drivers/tee/optee/smc_abi.c
+++ b/drivers/tee/optee/smc_abi.c
@@ -1417,8 +1417,10 @@ static int optee_probe(struct platform_device *pdev)
platform_set_drvdata(pdev, optee);
ctx = teedev_open(optee->teedev);
- if (IS_ERR(ctx))
+ if (IS_ERR(ctx)) {
+ rc = PTR_ERR(ctx);
goto err_supp_uninit;
+ }
optee->ctx = ctx;
rc = optee_notif_init(optee, max_notif_value);
if (rc)
--
2.25.1
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH -next] tee: optee: fix error return code in probe function
2022-02-10 9:10 [PATCH -next] tee: optee: fix error return code in probe function Yang Yingliang
@ 2022-02-14 11:48 ` Jens Wiklander
0 siblings, 0 replies; 2+ messages in thread
From: Jens Wiklander @ 2022-02-14 11:48 UTC (permalink / raw)
To: Yang Yingliang; +Cc: linux-kernel, op-tee, sumit.garg
On Thu, Feb 10, 2022 at 10:00 AM Yang Yingliang
<yangyingliang@huawei.com> wrote:
>
> If teedev_open() fails, probe function need return
> error code.
>
> Fixes: aceeafefff73 ("optee: use driver internal tee_context for some rpc")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Yang Yingliang <yangyingliang@huawei.com>
> ---
> drivers/tee/optee/ffa_abi.c | 4 +++-
> drivers/tee/optee/smc_abi.c | 4 +++-
> 2 files changed, 6 insertions(+), 2 deletions(-)
Well spotted, I'm picking up this.
Thanks,
Jens
>
> diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
> index f2bf6c61197f..f744ab15bf2c 100644
> --- a/drivers/tee/optee/ffa_abi.c
> +++ b/drivers/tee/optee/ffa_abi.c
> @@ -869,8 +869,10 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
> optee_supp_init(&optee->supp);
> ffa_dev_set_drvdata(ffa_dev, optee);
> ctx = teedev_open(optee->teedev);
> - if (IS_ERR(ctx))
> + if (IS_ERR(ctx)) {
> + rc = PTR_ERR(ctx);
> goto err_rhashtable_free;
> + }
> optee->ctx = ctx;
> rc = optee_notif_init(optee, OPTEE_DEFAULT_MAX_NOTIF_VALUE);
> if (rc)
> diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
> index 1a55339c7072..c517d310249f 100644
> --- a/drivers/tee/optee/smc_abi.c
> +++ b/drivers/tee/optee/smc_abi.c
> @@ -1417,8 +1417,10 @@ static int optee_probe(struct platform_device *pdev)
>
> platform_set_drvdata(pdev, optee);
> ctx = teedev_open(optee->teedev);
> - if (IS_ERR(ctx))
> + if (IS_ERR(ctx)) {
> + rc = PTR_ERR(ctx);
> goto err_supp_uninit;
> + }
> optee->ctx = ctx;
> rc = optee_notif_init(optee, max_notif_value);
> if (rc)
> --
> 2.25.1
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-02-14 11:50 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-10 9:10 [PATCH -next] tee: optee: fix error return code in probe function Yang Yingliang
2022-02-14 11:48 ` Jens Wiklander
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®