From: Sumit Garg <sumit.garg@linaro.org>
To: cgel.zte@gmail.com
Cc: jens.wiklander@linaro.org, op-tee@lists.trustedfirmware.org,
linux-kernel@vger.kernel.org, Lv Ruyi <lv.ruyi@zte.com.cn>,
Zeal Robot <zealci@zte.com.cn>
Subject: Re: [PATCH] optee: fix kfree NULL pointer
Date: Mon, 8 Nov 2021 11:03:53 +0530 [thread overview]
Message-ID: <CAFA6WYPOz1g+-6=Roo88qwcSv9W5vsbVHFWTzv_ALXxyMsLJ8w@mail.gmail.com> (raw)
In-Reply-To: <20211104113047.28585-1-lv.ruyi@zte.com.cn>
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
>
next prev parent reply other threads:[~2021-11-08 5:38 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-04 11:30 [PATCH] optee: fix kfree NULL pointer cgel.zte
2021-11-08 5:33 ` Sumit Garg [this message]
2021-11-15 12:36 ` Jens Wiklander
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAFA6WYPOz1g+-6=Roo88qwcSv9W5vsbVHFWTzv_ALXxyMsLJ8w@mail.gmail.com' \
--to=sumit.garg@linaro.org \
--cc=cgel.zte@gmail.com \
--cc=jens.wiklander@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lv.ruyi@zte.com.cn \
--cc=op-tee@lists.trustedfirmware.org \
--cc=zealci@zte.com.cn \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).