* [PATCH v2] iio: common: st_sensors: fix possible infinite loop in st_sensors_irq_thread
@ 2020-12-05 10:10 Lorenzo Bianconi
2020-12-05 18:29 ` Jonathan Cameron
0 siblings, 1 reply; 2+ messages in thread
From: Lorenzo Bianconi @ 2020-12-05 10:10 UTC (permalink / raw)
To: jic23; +Cc: lorenzo.bianconi, linux-iio, linus.walleij, denis.ciocca
Return a boolean value in st_sensors_new_samples_available routine in
order to avoid an infinite loop in st_sensors_irq_thread if
stat_drdy.addr is not defined or stat_drdy read fails
Fixes: 90efe05562921 ("iio: st_sensors: harden interrupt handling")
Reported-by: Jonathan Cameron <jic23@kernel.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
---
Changes since v1:
- return true if the sensor does not have stat_drdy register
---
.../common/st_sensors/st_sensors_trigger.c | 20 ++++++++-----------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/drivers/iio/common/st_sensors/st_sensors_trigger.c b/drivers/iio/common/st_sensors/st_sensors_trigger.c
index 0507283bd4c1..d3f047e9d778 100644
--- a/drivers/iio/common/st_sensors/st_sensors_trigger.c
+++ b/drivers/iio/common/st_sensors/st_sensors_trigger.c
@@ -23,35 +23,31 @@
* @sdata: Sensor data.
*
* returns:
- * 0 - no new samples available
- * 1 - new samples available
- * negative - error or unknown
+ * false - no new samples available or read error
+ * true - new samples available
*/
-static int st_sensors_new_samples_available(struct iio_dev *indio_dev,
- struct st_sensor_data *sdata)
+static bool st_sensors_new_samples_available(struct iio_dev *indio_dev,
+ struct st_sensor_data *sdata)
{
int ret, status;
/* How would I know if I can't check it? */
if (!sdata->sensor_settings->drdy_irq.stat_drdy.addr)
- return -EINVAL;
+ return true;
/* No scan mask, no interrupt */
if (!indio_dev->active_scan_mask)
- return 0;
+ return false;
ret = regmap_read(sdata->regmap,
sdata->sensor_settings->drdy_irq.stat_drdy.addr,
&status);
if (ret < 0) {
dev_err(sdata->dev, "error checking samples available\n");
- return ret;
+ return false;
}
- if (status & sdata->sensor_settings->drdy_irq.stat_drdy.mask)
- return 1;
-
- return 0;
+ return !!(status & sdata->sensor_settings->drdy_irq.stat_drdy.mask);
}
/**
--
2.28.0
^ permalink raw reply related [flat|nested] 2+ messages in thread* Re: [PATCH v2] iio: common: st_sensors: fix possible infinite loop in st_sensors_irq_thread
2020-12-05 10:10 [PATCH v2] iio: common: st_sensors: fix possible infinite loop in st_sensors_irq_thread Lorenzo Bianconi
@ 2020-12-05 18:29 ` Jonathan Cameron
0 siblings, 0 replies; 2+ messages in thread
From: Jonathan Cameron @ 2020-12-05 18:29 UTC (permalink / raw)
To: Lorenzo Bianconi; +Cc: lorenzo.bianconi, linux-iio, linus.walleij, denis.ciocca
On Sat, 5 Dec 2020 11:10:41 +0100
Lorenzo Bianconi <lorenzo@kernel.org> wrote:
> Return a boolean value in st_sensors_new_samples_available routine in
> order to avoid an infinite loop in st_sensors_irq_thread if
> stat_drdy.addr is not defined or stat_drdy read fails
>
> Fixes: 90efe05562921 ("iio: st_sensors: harden interrupt handling")
> Reported-by: Jonathan Cameron <jic23@kernel.org>
> Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Oops. I should not noticed this and replied here.
See reply to previous version. I think this will create an infinite
loop in the obscure case of no status register + an edge interrupt.
My gut feeling is we can't support that combination so should fail
at probe time if it is specified. It's broken hardware / dt.
Jonathan
> ---
> Changes since v1:
> - return true if the sensor does not have stat_drdy register
> ---
> .../common/st_sensors/st_sensors_trigger.c | 20 ++++++++-----------
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/iio/common/st_sensors/st_sensors_trigger.c b/drivers/iio/common/st_sensors/st_sensors_trigger.c
> index 0507283bd4c1..d3f047e9d778 100644
> --- a/drivers/iio/common/st_sensors/st_sensors_trigger.c
> +++ b/drivers/iio/common/st_sensors/st_sensors_trigger.c
> @@ -23,35 +23,31 @@
> * @sdata: Sensor data.
> *
> * returns:
> - * 0 - no new samples available
> - * 1 - new samples available
> - * negative - error or unknown
> + * false - no new samples available or read error
> + * true - new samples available
> */
> -static int st_sensors_new_samples_available(struct iio_dev *indio_dev,
> - struct st_sensor_data *sdata)
> +static bool st_sensors_new_samples_available(struct iio_dev *indio_dev,
> + struct st_sensor_data *sdata)
> {
> int ret, status;
>
> /* How would I know if I can't check it? */
> if (!sdata->sensor_settings->drdy_irq.stat_drdy.addr)
> - return -EINVAL;
> + return true;
>
> /* No scan mask, no interrupt */
> if (!indio_dev->active_scan_mask)
> - return 0;
> + return false;
>
> ret = regmap_read(sdata->regmap,
> sdata->sensor_settings->drdy_irq.stat_drdy.addr,
> &status);
> if (ret < 0) {
> dev_err(sdata->dev, "error checking samples available\n");
> - return ret;
> + return false;
> }
>
> - if (status & sdata->sensor_settings->drdy_irq.stat_drdy.mask)
> - return 1;
> -
> - return 0;
> + return !!(status & sdata->sensor_settings->drdy_irq.stat_drdy.mask);
> }
>
> /**
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-05 18:30 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-05 10:10 [PATCH v2] iio: common: st_sensors: fix possible infinite loop in st_sensors_irq_thread Lorenzo Bianconi
2020-12-05 18:29 ` Jonathan Cameron
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).