2021-11-22 02:20:57

by Yang Li

Subject: [PATCH -next v2] 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]>
---

change in v2:
--According to Jens's suggestion
fixed as:
if (memremaped_shm)
memunmap(memremaped_shm);

drivers/tee/optee/smc_abi.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
index 92759d7..d7c8235 100644
--- a/drivers/tee/optee/smc_abi.c
+++ b/drivers/tee/optee/smc_abi.c
@@ -1505,8 +1505,8 @@ 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);
+ if (memremaped_shm)
+ memunmap(memremaped_shm);
return rc;
}

--
1.8.3.1

2021-11-29 09:07:36

by Jens Wiklander

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

On Mon, Nov 22, 2021 at 3:20 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]>
> ---
>
> change in v2:
> --According to Jens's suggestion
> fixed as:
> if (memremaped_shm)
> memunmap(memremaped_shm);
>
> drivers/tee/optee/smc_abi.c | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)

Applied to https://git.linaro.org/people/jens.wiklander/linux-tee.git/
async_notif

Thanks,
Jens

>
> diff --git a/drivers/tee/optee/smc_abi.c b/drivers/tee/optee/smc_abi.c
> index 92759d7..d7c8235 100644
> --- a/drivers/tee/optee/smc_abi.c
> +++ b/drivers/tee/optee/smc_abi.c
> @@ -1505,8 +1505,8 @@ 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);
> + if (memremaped_shm)
> + memunmap(memremaped_shm);
> return rc;
> }
>
> --
> 1.8.3.1
>