From: Arnd Bergmann <arnd@arndb.de>
To: linaro-kernel@lists.linaro.org
Cc: Viresh Kumar <viresh.kumar@linaro.org>,
Rafael Wysocki <rjw@rjwysocki.net>,
Viresh Kumar <vireshk@kernel.org>, Nishanth Menon <nm@ti.com>,
Stephen Boyd <sboyd@codeaurora.org>,
Jon Hunter <jonathanh@nvidia.com>,
linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org
Subject: Re: [PATCH] PM / OPP: Initialize regulator pointer to an error value
Date: Mon, 15 Feb 2016 21:38:14 +0100 [thread overview]
Message-ID: <17646703.2nZXD4icYj@wuerfel> (raw)
In-Reply-To: <743509d913cbc0e725bea52281be03b009e02bb5.1455553501.git.viresh.kumar@linaro.org>
On Monday 15 February 2016 21:56:42 Viresh Kumar wrote:
> We are currently required to do two checks for regulator pointer:
> IS_ERR() and IS_NULL().
>
> And multiple instances are reported, about both of these not being used
> consistently and so resulting in crashes.
>
> Fix that by initializing regulator pointer with an error value and
> checking it only against an error.
>
> This makes code consistent and efficient.
There is usually something else wrong if you have to check for both.
Why exactly do you need to check for both IS_ERR and NULL?
> diff --git a/drivers/base/power/opp/core.c b/drivers/base/power/opp/core.c
> index d7cd4e265766..146b6197d598 100644
> --- a/drivers/base/power/opp/core.c
> +++ b/drivers/base/power/opp/core.c
> @@ -257,7 +257,7 @@ unsigned long dev_pm_opp_get_max_volt_latency(struct device *dev)
> }
>
> reg = dev_opp->regulator;
> - if (IS_ERR_OR_NULL(reg)) {
> + if (IS_ERR(reg)) {
> /* Regulator may not be required for device */
> if (reg)
> dev_err(dev, "%s: Invalid regulator (%ld)\n", __func__,
> @@ -798,6 +798,9 @@ static struct device_opp *_add_device_opp(struct device *dev)
> of_node_put(np);
> }
>
> + /* Set regulator to a non-NULL error value */
> + dev_opp->regulator = ERR_PTR(-EFAULT);
> +
> /* Find clk for the device */
> dev_opp->clk = clk_get(dev, NULL);
> if (IS_ERR(dev_opp->clk)) {
-EFAULT has a very specific meaning (accessing an invalid pointer from
user space), I don't think you want that one.
Arnd
next prev parent reply other threads:[~2016-02-15 20:38 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-11 11:25 [PATCH] PM / OPP: Fix NULL pointer dereference crash when disabling OPPs Jon Hunter
[not found] ` <1455189959-27944-1-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2016-02-11 11:34 ` Viresh Kumar
2016-02-11 21:16 ` Rafael J. Wysocki
2016-02-15 13:59 ` [PATCH] PM / OPP: Fix NULL pointer dereference crash when setting the OPP Jon Hunter
[not found] ` <1455544758-7718-1-git-send-email-jonathanh-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
2016-02-15 16:25 ` Viresh Kumar
2016-02-15 16:26 ` [PATCH] PM / OPP: Initialize regulator pointer to an error value Viresh Kumar
2016-02-15 16:42 ` Jon Hunter
2016-02-15 16:44 ` Viresh Kumar
2016-02-15 20:38 ` Arnd Bergmann [this message]
2016-02-15 21:13 ` Rafael J. Wysocki
2016-02-16 0:47 ` Viresh Kumar
2016-02-16 0:50 ` Rafael J. Wysocki
2016-02-16 1:00 ` Viresh Kumar
2016-02-16 1:56 ` Mark Brown
2016-02-16 9:10 ` Arnd Bergmann
2016-02-16 13:11 ` Mark Brown
2016-02-16 15:12 ` Arnd Bergmann
2016-02-16 16:51 ` Mark Brown
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=17646703.2nZXD4icYj@wuerfel \
--to=arnd@arndb.de \
--cc=jonathanh@nvidia.com \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=nm@ti.com \
--cc=rjw@rjwysocki.net \
--cc=sboyd@codeaurora.org \
--cc=viresh.kumar@linaro.org \
--cc=vireshk@kernel.org \
/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