From: Dan Carpenter <dan.carpenter@oracle.com>
To: Viresh Kumar <viresh.kumar@linaro.org>
Cc: Rafael Wysocki <rjw@rjwysocki.net>,
nm@ti.com, sboyd@codeaurora.org, linaro-kernel@lists.linaro.org,
linux-pm@vger.kernel.org, khilman@linaro.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Len Brown <len.brown@intel.com>,
open list <linux-kernel@vger.kernel.org>,
Pavel Machek <pavel@ucw.cz>
Subject: Re: [PATCH V2 1/6] PM / OPP: Free resources and properly return error on failure
Date: Tue, 11 Aug 2015 17:43:45 +0300 [thread overview]
Message-ID: <20150811144345.GN5180@mwanda> (raw)
In-Reply-To: <334a9052264630b9157fa9bfc3d4efe945054c34.1439288881.git.viresh.kumar@linaro.org>
On Tue, Aug 11, 2015 at 04:04:34PM +0530, Viresh Kumar wrote:
> _of_init_opp_table_v2() isn't freeing up resources on some errors and
> the error values returned are also not correct always.
>
> This fixes following problems:
> - Return -ENOENT, if no entries are found in the table.
> - Use IS_ERR() to properly check return value of _find_device_opp().
> - Return error value with PTR_ERR() in above case.
> - Free table if _find_device_opp() fails.
>
> Fixes: 274659029c9d ("PM / OPP: Add support to parse operating-points-v2" bindings")
> Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
> ---
> drivers/base/power/opp.c | 29 +++++++++++++++--------------
> 1 file changed, 15 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/base/power/opp.c b/drivers/base/power/opp.c
> index 204c6c945168..bcbd92c3b717 100644
> --- a/drivers/base/power/opp.c
> +++ b/drivers/base/power/opp.c
> @@ -1323,28 +1323,29 @@ static int _of_init_opp_table_v2(struct device *dev,
> if (ret) {
> dev_err(dev, "%s: Failed to add OPP, %d\n", __func__,
> ret);
> - break;
> + goto free_table;
> }
> }
>
> /* There should be one of more OPP defined */
> - if (WARN_ON(!count))
> + if (WARN_ON(!count)) {
> + ret = -ENOENT;
> goto put_opp_np;
> + }
This is weird to me, because we are going backwards. What happens if
we goto free_table without adding anything? I suspect it's fine, but if
it's a bug then this code still has problems.
What about if we only increment count when _opp_add_static_v2()
succeeds, and change it back to the original where we break, check
count, then check ret. That way we don't need to know the details of
free_table to see that the code is correct.
regards,
dan carpenter
next prev parent reply other threads:[~2015-08-11 14:44 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-08-11 10:34 [PATCH V2 0/6] PM / OPP: Add debugfs support Viresh Kumar
2015-08-11 10:34 ` [PATCH V2 1/6] PM / OPP: Free resources and properly return error on failure Viresh Kumar
2015-08-11 14:43 ` Dan Carpenter [this message]
2015-08-11 14:59 ` Viresh Kumar
2015-08-11 17:11 ` Dan Carpenter
2015-08-12 6:43 ` Viresh Kumar
2015-08-12 8:11 ` Dan Carpenter
2015-08-12 8:23 ` Viresh Kumar
2015-08-12 9:03 ` Dan Carpenter
2015-08-12 10:10 ` Viresh Kumar
2015-08-12 10:52 ` Dan Carpenter
2015-08-11 10:34 ` [PATCH V2 2/6] PM / OPP: reuse of_parse_phandle() Viresh Kumar
2015-08-11 10:34 ` [PATCH V2 3/6] PM / OPP: Prefix exported opp routines with dev_pm_opp_ Viresh Kumar
2015-08-11 10:34 ` [PATCH V2 4/6] PM / OPP: Move opp core to its own directory Viresh Kumar
2015-08-11 10:34 ` [PATCH V2 5/6] PM / OPP: Move cpu specific code to opp/cpu.c Viresh Kumar
2015-08-11 10:34 ` [PATCH V2 6/6] PM / OPP: Add debugfs support Viresh Kumar
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=20150811144345.GN5180@mwanda \
--to=dan.carpenter@oracle.com \
--cc=gregkh@linuxfoundation.org \
--cc=khilman@linaro.org \
--cc=len.brown@intel.com \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=nm@ti.com \
--cc=pavel@ucw.cz \
--cc=rjw@rjwysocki.net \
--cc=sboyd@codeaurora.org \
--cc=viresh.kumar@linaro.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;
as well as URLs for NNTP newsgroup(s).