diff mbox series

[v1] iio: adc: PAC1934: fix accessing out of bounds array index

Message ID 20240425114232.81390-1-marius.cristea@microchip.com (mailing list archive)
State Accepted
Headers show
Series [v1] iio: adc: PAC1934: fix accessing out of bounds array index | expand

Commit Message

marius.cristea@microchip.com April 25, 2024, 11:42 a.m. UTC 
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>
---
 drivers/iio/adc/pac1934.c | 9 +++++++++
 1 file changed, 9 insertions(+)


base-commit: b80ad8e3cd2712b78b98804d1f59199680d8ed91

Comments

Conor Dooley April 25, 2024, 12:22 p.m. UTC | #1 
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>
> ---
>  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
>
Conor Dooley April 25, 2024, 3:36 p.m. UTC | #2 
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>

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
> >
Jonathan Cameron April 28, 2024, 1:32 p.m. UTC | #3 
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
> > >   
> 
>
diff mbox series

Patch

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;