2021-11-19 08:05:50

by Yang Li

Subject: [PATCH -next] optee: Fix NULL but dereferenced coccicheck error

Eliminate the following coccicheck warning:
./drivers/tee/optee/smc_abi.c:1508:12-15: ERROR: optee is NULL but
dereferenced.

Reported-by: Abaci Robot <[email protected]>
Fixes: 'commit 6749e69c4dad ("optee: add asynchronous notifications")'
Signed-off-by: Yang Li <[email protected]>
---
drivers/tee/optee/smc_abi.c | 2 --
1 file changed, 2 deletions(-)

diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
index 92759d7..1f471ff 100644
--- a/drivers/tee/optee/smc_abi.c
+++ b/drivers/tee/optee/smc_abi.c
@@ -1505,8 +1505,6 @@ static int optee_probe(struct platform_device *pdev)
kfree(optee);
err_free_pool:
tee_shm_pool_free(pool);
- if (optee->smc.memremaped_shm)
- memunmap(optee->smc.memremaped_shm);
return rc;
}

--
1.8.3.1

2021-11-19 12:04:42

by Jens Wiklander

Subject: Re: [PATCH -next] optee: Fix NULL but dereferenced coccicheck error

On Fri, Nov 19, 2021 at 9:05 AM Yang Li <[email protected]> wrote:
>
> Eliminate the following coccicheck warning:
> ./drivers/tee/optee/smc_abi.c:1508:12-15: ERROR: optee is NULL but
> dereferenced.
>
> Reported-by: Abaci Robot <[email protected]>
> Fixes: 'commit 6749e69c4dad ("optee: add asynchronous notifications")'
> Signed-off-by: Yang Li <[email protected]>
> ---
> drivers/tee/optee/smc_abi.c | 2 --
> 1 file changed, 2 deletions(-)
>
> diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
> index 92759d7..1f471ff 100644
> --- a/drivers/tee/optee/smc_abi.c
> +++ b/drivers/tee/optee/smc_abi.c
> @@ -1505,8 +1505,6 @@ static int optee_probe(struct platform_device *pdev)
> kfree(optee);
> err_free_pool:
> tee_shm_pool_free(pool);
> - if (optee->smc.memremaped_shm)
> - memunmap(optee->smc.memremaped_shm);

Thanks for reporting. This should rather be fixed as:
if (memremaped_shm)
memunmap(memremaped_shm);

Cheers,
Jens

> return rc;
> }
>
> --
> 1.8.3.1
>