2021-11-04 11:32:12

by CGEL

Subject: [PATCH] optee: fix kfree NULL pointer

From: Lv Ruyi <[email protected]>

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 <[email protected]>
Signed-off-by: Lv Ruyi <[email protected]>
---
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;
}
optee->pool = optee_ffa_config_dyn_shm();
if (IS_ERR(optee->pool)) {
--
2.25.1

2021-11-08 09:27:19

by Sumit Garg

Subject: Re: [PATCH] optee: fix kfree NULL pointer

On Thu, 4 Nov 2021 at 17:00, <[email protected]> wrote:
>
> From: Lv Ruyi <[email protected]>
>
> 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 <[email protected]>
> Signed-off-by: Lv Ruyi <[email protected]>
> ---
> 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 <[email protected]>

-Sumit

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

2021-11-15 12:37:09

by Jens Wiklander

Subject: Re: [PATCH] optee: fix kfree NULL pointer

On Mon, Nov 8, 2021 at 6:34 AM Sumit Garg <[email protected]> wrote:
>
> On Thu, 4 Nov 2021 at 17:00, <[email protected]> wrote:
> >
> > From: Lv Ruyi <[email protected]>
> >
> > 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 <[email protected]>
> > Signed-off-by: Lv Ruyi <[email protected]>
> > ---
> > 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 <[email protected]>

I'll fix up the commit and pick it up now.

Thanks,
Jens