Received-SPF: pass (google.com: domain of linux-kernel+bounces-158814-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3;
Date: Thu, 25 Apr 2024 16:36:19 +0100
From: Conor Dooley <conor@kernel.org>
To: Conor Dooley <conor.dooley@microchip.com>
Cc: marius.cristea@microchip.com, jic23@kernel.org, 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
Message-ID: <20240425-vastly-salad-e56b9225e662@spud>
References: <20240425114232.81390-1-marius.cristea@microchip.com>
 <20240425-canteen-alias-5a907b1deecc@wendy>
Precedence: bulk
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
	protocol="application/pgp-signature"; boundary="M4AyjKAjLs9Ns3jd"
Content-Disposition: inline
In-Reply-To: <20240425-canteen-alias-5a907b1deecc@wendy>


--M4AyjKAjLs9Ns3jd
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

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 wr=
ote:
> > From: Marius Cristea <marius.cristea@microchip.com>
> >=20
> > 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.
> >=20
> > 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-ab5f105=
60d93@wendy/
Tested-by: Conor Dooley <conor.dooley@microchip.com>

Cheers,
Conor.

> > ---
> >  drivers/iio/adc/pac1934.c | 9 +++++++++
> >  1 file changed, 9 insertions(+)
> >=20
> > 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 =3D chan->channel - 1;
> > =20
> > +	/*
> > +	 * 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 >=3D PAC1934_MAX_NUM_CHANNELS)
> > +		channel =3D channel - PAC1934_MAX_NUM_CHANNELS;
> > +
> >  	ret =3D pac1934_retrieve_data(info, PAC1934_MIN_UPDATE_WAIT_TIME_US);
> >  	if (ret < 0)
> >  		return ret;
> >=20
> > base-commit: b80ad8e3cd2712b78b98804d1f59199680d8ed91
> > --=20
> > 2.34.1
> >=20


--M4AyjKAjLs9Ns3jd
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iHUEABYIAB0WIQRh246EGq/8RLhDjO14tDGHoIJi0gUCZip4cgAKCRB4tDGHoIJi
0mHPAQCwPscxxdp0iUJ3vOyfhjjtaJ1mNh5Cm8R8/GsCcFznZQD+Ptu6tlhKrd9l
epAaKawJi6jP3BjS/BYYF+/1gFlywww=
=Bku/
-----END PGP SIGNATURE-----

--M4AyjKAjLs9Ns3jd--