Commit 30c694fd authored by Martin Fuzzey's avatar Martin Fuzzey Committed by Mark Brown

regulator: da9063: better fix null deref with partial DT

Two versions of the original patch were sent but V1 was merged instead
of V2 due to a mistake.

So update to V2.

The advantage of V2 is that it completely avoids dereferencing the pointer,
even just to take the address, which may fix problems with some compilers.
Both versions work on my gcc 9.4 but use the safer one.

Fixes: 98e2dd5f ("regulator: da9063: fix null pointer deref with partial DT config")
Signed-off-by: default avatarMartin Fuzzey <martin.fuzzey@flowbird.group>
Tested-by: default avatarBenjamin Bara <benjamin.bara@skidata.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20230804083514.1887124-1-martin.fuzzey@flowbird.groupSigned-off-by: default avatarMark Brown <broonie@kernel.org>
parent 5d0c230f
......@@ -778,9 +778,6 @@ static int da9063_check_xvp_constraints(struct regulator_config *config)
const struct notification_limit *uv_l = &constr->under_voltage_limits;
const struct notification_limit *ov_l = &constr->over_voltage_limits;
if (!config->init_data) /* No config in DT, pointers will be invalid */
return 0;
/* make sure that only one severity is used to clarify if unchanged, enabled or disabled */
if ((!!uv_l->prot + !!uv_l->err + !!uv_l->warn) > 1) {
dev_err(config->dev, "%s: at most one voltage monitoring severity allowed!\n",
......@@ -1031,9 +1028,12 @@ static int da9063_regulator_probe(struct platform_device *pdev)
config.of_node = da9063_reg_matches[id].of_node;
config.regmap = da9063->regmap;
/* Checking constraints requires init_data from DT. */
if (config.init_data) {
ret = da9063_check_xvp_constraints(&config);
if (ret)
return ret;
}
regl->rdev = devm_regulator_register(&pdev->dev, &regl->desc,
&config);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment