| Message ID | 20181008212451.18637-1-nicoleotsuka@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [v2] hwmon: (ina3221) Validate shunt resistor value from DT | expand |
On Mon, Oct 08, 2018 at 02:24:51PM -0700, Nicolin Chen wrote: > The input->shunt_resistor is int type while the value from DT is > unsigned int. Meanwhile, a divide-by-zero error would happen if > the value is 0. So this patch just simply validates the value. > > Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com> Applied. Thanks, Guenter > --- > Changelog > v1->v2: > * Validate the value and error out > > drivers/hwmon/ina3221.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c > index c3a497aed345..4f3ed24efe8e 100644 > --- a/drivers/hwmon/ina3221.c > +++ b/drivers/hwmon/ina3221.c > @@ -536,8 +536,14 @@ static int ina3221_probe_child_from_dt(struct device *dev, > of_property_read_string(child, "label", &input->label); > > /* Overwrite default shunt resistor value optionally */ > - if (!of_property_read_u32(child, "shunt-resistor-micro-ohms", &val)) > + if (!of_property_read_u32(child, "shunt-resistor-micro-ohms", &val)) { > + if (val < 1 || val > INT_MAX) { > + dev_err(dev, "invalid shunt resistor value %u of %s\n", > + val, child->name); > + return -EINVAL; > + } > input->shunt_resistor = val; > + } > > return 0; > }
diff --git a/drivers/hwmon/ina3221.c b/drivers/hwmon/ina3221.c index c3a497aed345..4f3ed24efe8e 100644 --- a/drivers/hwmon/ina3221.c +++ b/drivers/hwmon/ina3221.c @@ -536,8 +536,14 @@ static int ina3221_probe_child_from_dt(struct device *dev, of_property_read_string(child, "label", &input->label); /* Overwrite default shunt resistor value optionally */ - if (!of_property_read_u32(child, "shunt-resistor-micro-ohms", &val)) + if (!of_property_read_u32(child, "shunt-resistor-micro-ohms", &val)) { + if (val < 1 || val > INT_MAX) { + dev_err(dev, "invalid shunt resistor value %u of %s\n", + val, child->name); + return -EINVAL; + } input->shunt_resistor = val; + } return 0; }
The input->shunt_resistor is int type while the value from DT is unsigned int. Meanwhile, a divide-by-zero error would happen if the value is 0. So this patch just simply validates the value. Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com> --- Changelog v1->v2: * Validate the value and error out drivers/hwmon/ina3221.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-)