From: Eduardo Valentin <edubezval@gmail.com>
To: Colin King <colin.king@canonical.com>
Cc: Zhang Rui <rui.zhang@intel.com>,
linux-pm@vger.kernel.org, kernel-janitors@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] thermal: armada: fix incorrect check for drvdata allocation failure
Date: Mon, 20 Aug 2018 18:52:34 +0000 [thread overview]
Message-ID: <20180820185232.GA16026@localhost.localdomain> (raw)
In-Reply-To: <20180730122716.6267-1-colin.king@canonical.com>
hello Colin,
On Mon, Jul 30, 2018 at 01:27:16PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently the drvdata allocation failure is being incorrectly checked by
> checking priv and not drvdata. Fix this and also free priv to fix a
> memory leak.
>
> Detected by Coverity Scan, CID#1472102 ("Logically dead code")
>
> Fixes: c9899c183921 ("thermal: armada: use the resource managed registration helper alternative")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> drivers/thermal/armada_thermal.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
> index 4164a5a4e480..b164fd9f21ac 100644
> --- a/drivers/thermal/armada_thermal.c
> +++ b/drivers/thermal/armada_thermal.c
> @@ -611,8 +611,10 @@ static int armada_thermal_probe(struct platform_device *pdev)
> return -ENOMEM;
>
> drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL);
> - if (!priv)
> + if (!drvdata) {
Thanks for the fix but, I already collected this patch:
84b64de597bc ("thermal: armada: fix copy-paste error in armada_thermal_probe()")
which fixes the same issue you are addressing here.
> + devm_kfree(&pdev->dev, priv);
As already mentioned by Daniel, the above is not necessary, as it is a
devm_* helper.
BR,
> return -ENOMEM;
> + }
>
> priv->dev = &pdev->dev;
> priv->data = (struct armada_thermal_data *)match->data;
> --
> 2.17.1
>
WARNING: multiple messages have this Message-ID (diff)
From: Eduardo Valentin <edubezval@gmail.com>
To: Colin King <colin.king@canonical.com>
Cc: Zhang Rui <rui.zhang@intel.com>,
linux-pm@vger.kernel.org, kernel-janitors@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: Re: [PATCH] thermal: armada: fix incorrect check for drvdata allocation failure
Date: Mon, 20 Aug 2018 11:52:34 -0700 [thread overview]
Message-ID: <20180820185232.GA16026@localhost.localdomain> (raw)
In-Reply-To: <20180730122716.6267-1-colin.king@canonical.com>
hello Colin,
On Mon, Jul 30, 2018 at 01:27:16PM +0100, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> Currently the drvdata allocation failure is being incorrectly checked by
> checking priv and not drvdata. Fix this and also free priv to fix a
> memory leak.
>
> Detected by Coverity Scan, CID#1472102 ("Logically dead code")
>
> Fixes: c9899c183921 ("thermal: armada: use the resource managed registration helper alternative")
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
> drivers/thermal/armada_thermal.c | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/thermal/armada_thermal.c b/drivers/thermal/armada_thermal.c
> index 4164a5a4e480..b164fd9f21ac 100644
> --- a/drivers/thermal/armada_thermal.c
> +++ b/drivers/thermal/armada_thermal.c
> @@ -611,8 +611,10 @@ static int armada_thermal_probe(struct platform_device *pdev)
> return -ENOMEM;
>
> drvdata = devm_kzalloc(&pdev->dev, sizeof(*drvdata), GFP_KERNEL);
> - if (!priv)
> + if (!drvdata) {
Thanks for the fix but, I already collected this patch:
84b64de597bc ("thermal: armada: fix copy-paste error in armada_thermal_probe()")
which fixes the same issue you are addressing here.
> + devm_kfree(&pdev->dev, priv);
As already mentioned by Daniel, the above is not necessary, as it is a
devm_* helper.
BR,
> return -ENOMEM;
> + }
>
> priv->dev = &pdev->dev;
> priv->data = (struct armada_thermal_data *)match->data;
> --
> 2.17.1
>
next prev parent reply other threads:[~2018-08-20 18:52 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-07-30 12:27 [PATCH] thermal: armada: fix incorrect check for drvdata allocation failure Colin King
2018-07-30 12:27 ` Colin King
2018-07-30 14:14 ` Daniel Lezcano
2018-07-30 14:14 ` Daniel Lezcano
2018-08-20 18:52 ` Eduardo Valentin [this message]
2018-08-20 18:52 ` Eduardo Valentin
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=20180820185232.GA16026@localhost.localdomain \
--to=edubezval@gmail.com \
--cc=colin.king@canonical.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rui.zhang@intel.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.