From: Jonathan Cameron <jic23@kernel.org>
To: Conor Dooley <conor@kernel.org>
Cc: Conor Dooley <conor.dooley@microchip.com>,
marius.cristea@microchip.com, lars@metafoo.de,
lgirdwood@gmail.com, broonie@kernel.org,
linux-iio@vger.kernel.org, linux-kernel@vger.kernel.org,
conor+dt@kernel.org
Subject: Re: [PATCH v1] iio: adc: PAC1934: fix accessing out of bounds array index
Date: Sun, 28 Apr 2024 14:32:15 +0100 [thread overview]
Message-ID: <20240428143215.3388426d@jic23-huawei> (raw)
In-Reply-To: <20240425-vastly-salad-e56b9225e662@spud>
On Thu, 25 Apr 2024 16:36:19 +0100
Conor Dooley <conor@kernel.org> wrote:
> On Thu, Apr 25, 2024 at 01:22:45PM +0100, Conor Dooley wrote:
> > On Thu, Apr 25, 2024 at 02:42:32PM +0300, marius.cristea@microchip.com wrote:
> > > From: Marius Cristea <marius.cristea@microchip.com>
> > >
> > > Fix accessing out of bounds array index for average
> > > current and voltage measurements. The device itself has
> > > only 4 channels, but in sysfs there are "fake"
> > > channels for the average voltages and currents too.
> > >
> > > Fixes: 0fb528c8255b: "iio: adc: adding support for PAC193x"
> > > Reported-by: Conor Dooley <conor.dooley@microchip.com>
> > > Signed-off-by: Marius Cristea <marius.cristea@microchip.com>
>
>
> Huh, this is an empty message. I intended to send some tags, but must
> not have saved the buffer.
>
> Closes: https://lore.kernel.org/linux-iio/20240405-embellish-bonnet-ab5f10560d93@wendy/
> Tested-by: Conor Dooley <conor.dooley@microchip.com>
Applied to the fixes-togreg branch of iio.git
Thanks,
Jonathan
>
> Cheers,
> Conor.
>
> > > ---
> > > drivers/iio/adc/pac1934.c | 9 +++++++++
> > > 1 file changed, 9 insertions(+)
> > >
> > > diff --git a/drivers/iio/adc/pac1934.c b/drivers/iio/adc/pac1934.c
> > > index f751260605e4..456f12faa348 100644
> > > --- a/drivers/iio/adc/pac1934.c
> > > +++ b/drivers/iio/adc/pac1934.c
> > > @@ -787,6 +787,15 @@ static int pac1934_read_raw(struct iio_dev *indio_dev,
> > > s64 curr_energy;
> > > int ret, channel = chan->channel - 1;
> > >
> > > + /*
> > > + * For AVG the index should be between 5 to 8.
> > > + * To calculate PAC1934_CH_VOLTAGE_AVERAGE,
> > > + * respectively PAC1934_CH_CURRENT real index, we need
> > > + * to remove the added offset (PAC1934_MAX_NUM_CHANNELS).
> > > + */
> > > + if (channel >= PAC1934_MAX_NUM_CHANNELS)
> > > + channel = channel - PAC1934_MAX_NUM_CHANNELS;
> > > +
> > > ret = pac1934_retrieve_data(info, PAC1934_MIN_UPDATE_WAIT_TIME_US);
> > > if (ret < 0)
> > > return ret;
> > >
> > > base-commit: b80ad8e3cd2712b78b98804d1f59199680d8ed91
> > > --
> > > 2.34.1
> > >
>
>
prev parent reply other threads:[~2024-04-28 13:32 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-25 11:42 [PATCH v1] iio: adc: PAC1934: fix accessing out of bounds array index marius.cristea
2024-04-25 12:22 ` Conor Dooley
2024-04-25 15:36 ` Conor Dooley
2024-04-28 13:32 ` 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=20240428143215.3388426d@jic23-huawei \
--to=jic23@kernel.org \
--cc=broonie@kernel.org \
--cc=conor+dt@kernel.org \
--cc=conor.dooley@microchip.com \
--cc=conor@kernel.org \
--cc=lars@metafoo.de \
--cc=lgirdwood@gmail.com \
--cc=linux-iio@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=marius.cristea@microchip.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).