From: Jonathan Cameron <jic23@kernel.org>
To: Andy Shevchenko <andriy.shevchenko@intel.com>
Cc: Marek Vasut <marex@denx.de>,
linux-iio@vger.kernel.org, Andy Shevchenko <andy@kernel.org>,
Daniel Baluta <daniel.baluta@nxp.com>,
Jonathan Cameron <Jonathan.Cameron@huawei.com>
Subject: Re: [PATCH v3] iio: core: Print error in case sample bits do not fit storage bits
Date: Sat, 2 Apr 2022 17:32:31 +0100 [thread overview]
Message-ID: <20220402173231.492a8c3a@jic23-huawei> (raw)
In-Reply-To: <YkRunZ15S5noNYbJ@smile.fi.intel.com>
On Wed, 30 Mar 2022 17:52:13 +0300
Andy Shevchenko <andriy.shevchenko@intel.com> wrote:
> On Mon, Mar 28, 2022 at 09:53:07PM +0200, Marek Vasut wrote:
> > Add runtime check to verify whether storagebits are at least as big
> > as shifted realbits. This should help spot broken drivers which may
> > set realbits + shift above storagebits.
>
> Let's go with it.
> Reviewed-by: Andy Shevchenko <andy@kernel.org>
Agreed. Applied with a slight change to the title to make it clear
we don't just print the error, we also fail the iio_device_register() call
Applied to the togreg branch of iio.git and pushed out as testing both to let
0-day poke at it and because I will rebase on rc1 once available.
Thanks,
Jonathan
>
> > Signed-off-by: Marek Vasut <marex@denx.de>
> > Cc: Andy Shevchenko <andy@kernel.org>
> > Cc: Daniel Baluta <daniel.baluta@nxp.com>
> > Cc: Jonathan Cameron <Jonathan.Cameron@huawei.com>
> > ---
> > V2: Use dev_err() instead as WARN_ON() may panic() the kernel on existing machines
> > V3: Abort probe and return -EINVAL in case this condition is triggered
> > ---
> > drivers/iio/industrialio-buffer.c | 13 +++++++++++++
> > 1 file changed, 13 insertions(+)
> >
> > diff --git a/drivers/iio/industrialio-buffer.c b/drivers/iio/industrialio-buffer.c
> > index b078eb2f3c9de..75a1c57b49102 100644
> > --- a/drivers/iio/industrialio-buffer.c
> > +++ b/drivers/iio/industrialio-buffer.c
> > @@ -1629,6 +1629,19 @@ static int __iio_buffer_alloc_sysfs_and_mask(struct iio_buffer *buffer,
> > if (channels[i].scan_index < 0)
> > continue;
> >
> > + /* Verify that sample bits fit into storage */
> > + if (channels[i].scan_type.storagebits <
> > + channels[i].scan_type.realbits +
> > + channels[i].scan_type.shift) {
> > + dev_err(&indio_dev->dev,
> > + "Channel %d storagebits (%d) < shifted realbits (%d + %d)\n",
> > + i, channels[i].scan_type.storagebits,
> > + channels[i].scan_type.realbits,
> > + channels[i].scan_type.shift);
> > + ret = -EINVAL;
> > + goto error_cleanup_dynamic;
> > + }
> > +
> > ret = iio_buffer_add_channel_sysfs(indio_dev, buffer,
> > &channels[i]);
> > if (ret < 0)
> > --
> > 2.35.1
> >
>
next prev parent reply other threads:[~2022-04-02 16:24 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-28 19:53 [PATCH v3] iio: core: Print error in case sample bits do not fit storage bits Marek Vasut
2022-03-30 14:52 ` Andy Shevchenko
2022-04-02 16:32 ` Jonathan Cameron [this message]
2022-03-31 6:44 ` Sa, Nuno
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=20220402173231.492a8c3a@jic23-huawei \
--to=jic23@kernel.org \
--cc=Jonathan.Cameron@huawei.com \
--cc=andriy.shevchenko@intel.com \
--cc=andy@kernel.org \
--cc=daniel.baluta@nxp.com \
--cc=linux-iio@vger.kernel.org \
--cc=marex@denx.de \
/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