lkml.org 
[lkml]   [2021]   [Nov]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [PATCH] optee: fix kfree NULL pointer
On Thu, 4 Nov 2021 at 17:00, <cgel.zte@gmail.com> wrote:
>
> From: Lv Ruyi <lv.ruyi@zte.com.cn>
>
> This patch fixes the following Coccinelle error:
> drivers/tee/optee/ffa_abi.c: 877: ERROR optee is NULL but dereferenced.
>
> If memory allocation fails, optee is null pointer. the code will goto err
> and release optee.
>
> Reported-by: Zeal Robot <zealci@zte.com.cn>
> Signed-off-by: Lv Ruyi <lv.ruyi@zte.com.cn>
> ---
> drivers/tee/optee/ffa_abi.c | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/drivers/tee/optee/ffa_abi.c b/drivers/tee/optee/ffa_abi.c
> index 6defd1ec982a..8d9d189557f9 100644
> --- a/drivers/tee/optee/ffa_abi.c
> +++ b/drivers/tee/optee/ffa_abi.c
> @@ -811,8 +811,7 @@ static int optee_ffa_probe(struct ffa_device *ffa_dev)
>
> optee = kzalloc(sizeof(*optee), GFP_KERNEL);
> if (!optee) {
> - rc = -ENOMEM;
> - goto err;
> + return -ENOMEM;
> }

So the braces are redundant after this change, hence can be dropped.

With that addressed:

Reviewed-by: Sumit Garg <sumit.garg@linaro.org>

-Sumit

> optee->pool = optee_ffa_config_dyn_shm();
> if (IS_ERR(optee->pool)) {
> --
> 2.25.1
>

\
 
 \ /
  Last update: 2021-11-08 06:35    [W:2.286 / U:0.076 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site