From: Dan Carpenter <dan.carpenter@oracle.com>
To: Colin Ian King <colin.king@canonical.com>
Cc: Liam Girdwood <lgirdwood@gmail.com>,
Mark Brown <broonie@kernel.org>, Chen-Yu Tsai <wens@csie.org>,
kernel-janitors@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH][V2][next] regulator: axp20x: check rdev is null before dereferencing it
Date: Mon, 4 Feb 2019 22:30:42 +0300 [thread overview]
Message-ID: <20190204193042.GD2563@kadam> (raw)
In-Reply-To: <66f320fe-7df1-2715-ec55-ef7dc3493aa0@canonical.com>
On Mon, Feb 04, 2019 at 07:13:30PM +0000, Colin Ian King wrote:
> > drivers/regulator/axp20x-regulator.c | 8 ++++++--
> > 1 file changed, 6 insertions(+), 2 deletions(-)
> >
> > diff --git a/drivers/regulator/axp20x-regulator.c b/drivers/regulator/axp20x-regulator.c
> > index 48af859fd053..0dfa4ea6bbdf 100644
> > --- a/drivers/regulator/axp20x-regulator.c
> > +++ b/drivers/regulator/axp20x-regulator.c
> > @@ -367,7 +367,7 @@ static const int axp209_dcdc2_ldo3_slew_rates[] = {
> > static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)
> > {
> > struct axp20x_dev *axp20x = rdev_get_drvdata(rdev);
> > - const struct regulator_desc *desc = rdev->desc;
> > + const struct regulator_desc *desc;
This is only called from set_machine_constraints() so "rdev" can't be
NULL. (On my allmodonconfig build).
> > u8 reg, mask, enable, cfg = 0xff;
> > const int *slew_rates;
> > int rate_count = 0;
> > @@ -375,6 +375,8 @@ static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)
> > if (!rdev)
> > return -EINVAL;
> >
> > + desc = rdev->desc;
> > +
> > switch (axp20x->variant) {
> > case AXP209_ID:
> > if (desc->id == AXP20X_DCDC2) {
> > @@ -436,11 +438,13 @@ static int axp20x_set_ramp_delay(struct regulator_dev *rdev, int ramp)
> > static int axp20x_regulator_enable_regmap(struct regulator_dev *rdev)
> > {
> > struct axp20x_dev *axp20x = rdev_get_drvdata(rdev);
> > - const struct regulator_desc *desc = rdev->desc;
> > + const struct regulator_desc *desc;
> >
> > if (!rdev)
> > return -EINVAL;
> >
> > + desc = rdev->desc;
Called from _regulator_do_enable() and rdev can't be NULL:
ret = rdev->desc->ops->enable(rdev);
regards,
dan carpenter
next prev parent reply other threads:[~2019-02-04 19:31 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-22 11:31 [PATCH][V2][next] regulator: axp20x: check rdev is null before dereferencing it Colin King
2019-02-04 19:13 ` Colin Ian King
2019-02-04 19:24 ` Mark Brown
2019-02-04 19:30 ` Dan Carpenter [this message]
2019-02-05 3:37 ` Chen-Yu Tsai
2019-02-15 7:46 ` Dan Carpenter
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=20190204193042.GD2563@kadam \
--to=dan.carpenter@oracle.com \
--cc=broonie@kernel.org \
--cc=colin.king@canonical.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=lgirdwood@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=wens@csie.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