projects
/
wrapfs-3.2.y.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e5b219f
)
regulator: pfuze100-regulator: Variable "val" in pfuze100_regulator_probe() could...
author
Yizhuo
<yzhai003@ucr.edu>
Sun, 29 Sep 2019 17:09:57 +0000
(10:09 -0700)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Sun, 10 Nov 2019 10:21:05 +0000
(11:21 +0100)
[ Upstream commit
1252b283141f03c3dffd139292c862cae10e174d
]
In function pfuze100_regulator_probe(), variable "val" could be
initialized if regmap_read() fails. However, "val" is used to
decide the control flow later in the if statement, which is
potentially unsafe.
Signed-off-by: Yizhuo <yzhai003@ucr.edu>
Link:
https://lore.kernel.org/r/20190929170957.14775-1-yzhai003@ucr.edu
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/regulator/pfuze100-regulator.c
patch
|
blob
|
history
diff --git
a/drivers/regulator/pfuze100-regulator.c
b/drivers/regulator/pfuze100-regulator.c
index c68556bf6f3994b0adadd001e8295f4c7da9b284..ec185502dcebdfe8b76e9c4cfa1cdc0f2debb675 100644
(file)
--- a/
drivers/regulator/pfuze100-regulator.c
+++ b/
drivers/regulator/pfuze100-regulator.c
@@
-609,7
+609,13
@@
static int pfuze100_regulator_probe(struct i2c_client *client,
/* SW2~SW4 high bit check and modify the voltage value table */
if (i >= sw_check_start && i <= sw_check_end) {
- regmap_read(pfuze_chip->regmap, desc->vsel_reg, &val);
+ ret = regmap_read(pfuze_chip->regmap,
+ desc->vsel_reg, &val);
+ if (ret) {
+ dev_err(&client->dev, "Fails to read from the register.\n");
+ return ret;
+ }
+
if (val & sw_hi) {
if (pfuze_chip->chip_id == PFUZE3000) {
desc->volt_table = pfuze3000_sw2hi;