From: Jonathan Cameron <jic23@kernel.org>
To: Lorenzo Bianconi <lorenzo@kernel.org>
Cc: lorenzo.bianconi@redhat.com, linux-iio@vger.kernel.org,
linus.walleij@linaro.org, denis.ciocca@st.com
Subject: Re: [PATCH v2] iio: common: st_sensors: fix possible infinite loop in st_sensors_irq_thread
Date: Sat, 5 Dec 2020 18:29:07 +0000 [thread overview]
Message-ID: <20201205182907.5d2c948e@archlinux> (raw)
In-Reply-To: <58d40383f6e1faa14850f3a9b694b8e4cb4fbbec.1607162799.git.lorenzo@kernel.org>
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);
> }
>
> /**
prev parent reply other threads:[~2020-12-05 18:30 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
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 message]
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=20201205182907.5d2c948e@archlinux \
--to=jic23@kernel.org \
--cc=denis.ciocca@st.com \
--cc=linus.walleij@linaro.org \
--cc=linux-iio@vger.kernel.org \
--cc=lorenzo.bianconi@redhat.com \
--cc=lorenzo@kernel.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;
as well as URLs for NNTP newsgroup(s).