All of lore.kernel.org
 help / color / mirror / Atom feed
From: Lee Jones <lee@kernel.org>
To: lee@kernel.org, "Marius Cristea" <marius.cristea@microchip.com>,
	"Jonathan Cameron" <jic23@kernel.org>,
	"David Lechner" <dlechner@baylibre.com>,
	"Nuno Sá" <nuno.sa@analog.com>,
	"Andy Shevchenko" <andy@kernel.org>,
	"Bogdan Bolocan" <bogdan.bolocan@microchip.com>,
	linux-iio@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: [PATCH 06/10] iio: adc: pac1934: Fix custom attribute allocation and channel bounds
Date: Thu, 19 Nov 2026 15:30:39 +0000	[thread overview]
Message-ID: <20261119153151.1397003-7-lee@kernel.org> (raw)
In-Reply-To: <20261119153151.1397003-1-lee@kernel.org>

pac1934_prep_custom_attributes() sizes the pac1934_custom_attr pointer
array using sizeof(*pac1934_group) instead of
sizeof(*pac1934_custom_attr) and adds 1 byte rather than one pointer
element for the terminating NULL entry.  When active_channels_count is
zero, only a single byte is allocated and iio_device_register_sysfs()
reads past the allocation when scanning the attribute list.

In addition, active_channels_count is counted over info->phys_channels,
whereas the population steps unconditionally inspect all four entries of
info->active_channels[], which can write past the end of the array on
1-, 2-, and 3-channel chip variants.

Allocate active_channels_count + 1 attribute pointers with
devm_kzalloc_objs() and bound the population loop by
info->phys_channels.

Fixes: 0fb528c8255b ("iio: adc: adding support for PAC193x")
Closes: https://sashiko.dev/#/bug/linux-e7b7eab1-9ed4-4d4b-b9c7-889bf720aa5b
Cc: stable@vger.kernel.org
Signed-off-by: Lee Jones <lee@kernel.org>
---
 drivers/iio/adc/pac1934.c | 33 +++++++++++++++------------------
 1 file changed, 15 insertions(+), 18 deletions(-)

diff --git a/drivers/iio/adc/pac1934.c b/drivers/iio/adc/pac1934.c
index 1d7608e8246a..c3da0c519456 100644
--- a/drivers/iio/adc/pac1934.c
+++ b/drivers/iio/adc/pac1934.c
@@ -1435,10 +1435,17 @@ static IIO_DEVICE_ATTR(in_shunt_resistor3, 0644,
 static IIO_DEVICE_ATTR(in_shunt_resistor4, 0644,
 		       pac1934_shunt_value_show, pac1934_shunt_value_store, 3);
 
+static struct attribute * const pac1934_shunt_attrs[] = {
+	PAC1934_DEV_ATTR(in_shunt_resistor1),
+	PAC1934_DEV_ATTR(in_shunt_resistor2),
+	PAC1934_DEV_ATTR(in_shunt_resistor3),
+	PAC1934_DEV_ATTR(in_shunt_resistor4),
+};
+
 static int pac1934_prep_custom_attributes(struct pac1934_chip_info *info,
 					  struct iio_dev *indio_dev)
 {
-	int i, active_channels_count = 0;
+	int i, j, active_channels_count = 0;
 	struct attribute **pac1934_custom_attr;
 	struct attribute_group *pac1934_group;
 	struct device *dev = &info->client->dev;
@@ -1451,26 +1458,16 @@ static int pac1934_prep_custom_attributes(struct pac1934_chip_info *info,
 	if (!pac1934_group)
 		return -ENOMEM;
 
-	pac1934_custom_attr = devm_kzalloc(dev,
-					   (PAC1934_CUSTOM_ATTR_FOR_CHANNEL *
-					   active_channels_count)
-					   * sizeof(*pac1934_group) + 1,
-					   GFP_KERNEL);
+	pac1934_custom_attr = devm_kzalloc_objs(dev, *pac1934_custom_attr,
+						PAC1934_CUSTOM_ATTR_FOR_CHANNEL *
+						active_channels_count + 1);
 	if (!pac1934_custom_attr)
 		return -ENOMEM;
 
-	i = 0;
-	if (info->active_channels[0])
-		pac1934_custom_attr[i++] = PAC1934_DEV_ATTR(in_shunt_resistor1);
-
-	if (info->active_channels[1])
-		pac1934_custom_attr[i++] = PAC1934_DEV_ATTR(in_shunt_resistor2);
-
-	if (info->active_channels[2])
-		pac1934_custom_attr[i++] = PAC1934_DEV_ATTR(in_shunt_resistor3);
-
-	if (info->active_channels[3])
-		pac1934_custom_attr[i] = PAC1934_DEV_ATTR(in_shunt_resistor4);
+	j = 0;
+	for (i = 0; i < info->phys_channels; i++)
+		if (info->active_channels[i])
+			pac1934_custom_attr[j++] = pac1934_shunt_attrs[i];
 
 	pac1934_group->attrs = pac1934_custom_attr;
 	info->iio_info.attrs = pac1934_group;
-- 
2.56.1.708.g77570a6a1d-goog


  parent reply	other threads:[~2026-11-19 15:32 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-19 15:30 [PATCH 00/10] iio: Fix memory corruption, teardown races and bounds checks Lee Jones
2026-11-19 15:30 ` [PATCH 01/10] iio: imu: adis: Clear pointers after freeing in adis_update_scan_mode() Lee Jones
2026-11-19 15:30 ` [PATCH 02/10] iio: accel: adxl313: Prevent FIFO buffer overflow in adxl313_fifo_transfer() Lee Jones
2026-11-19 17:22   ` Andy Shevchenko
2026-11-19 15:30 ` [PATCH 03/10] iio: accel: adxl313: Reject sub-base ODR codes in adxl313_read_raw() Lee Jones
2026-11-19 17:23   ` Andy Shevchenko
2026-11-19 15:30 ` [PATCH 04/10] iio: adc: stm32-adc: Validate channel index before writing chan_name Lee Jones
2026-11-19 17:24   ` Andy Shevchenko
2026-11-20 17:22     ` Fabrice Gasnier
2026-11-19 15:30 ` [PATCH 05/10] iio: adc: stm32-adc: Detach chained IRQ handler before removing domain Lee Jones
2026-11-20 17:23   ` Fabrice Gasnier
2026-11-19 15:30 ` Lee Jones [this message]
2026-11-19 17:27   ` [PATCH 06/10] iio: adc: pac1934: Fix custom attribute allocation and channel bounds Andy Shevchenko
2026-11-19 15:30 ` [PATCH 07/10] iio: adc: qcom-spmi-adc5-gen3: Free TM auxiliary device wrapper in release callback Lee Jones
2026-11-19 17:30   ` Andy Shevchenko
2026-11-19 15:30 ` [PATCH 08/10] iio: adc: qcom-spmi-adc5-gen3: Reject empty reg property in probe Lee Jones
2026-11-19 17:31   ` Andy Shevchenko
2026-11-19 15:30 ` [PATCH 09/10] iio: proximity: isl29501: Fix division by zero and overflow in isl29501_set_freq() Lee Jones
2026-11-19 17:34   ` Andy Shevchenko
2026-11-19 15:30 ` [PATCH 10/10] iio: light: tsl2591: Prevent infinite recursion on threshold boundaries Lee Jones

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=20261119153151.1397003-7-lee@kernel.org \
    --to=lee@kernel.org \
    --cc=andy@kernel.org \
    --cc=bogdan.bolocan@microchip.com \
    --cc=dlechner@baylibre.com \
    --cc=jic23@kernel.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=marius.cristea@microchip.com \
    --cc=nuno.sa@analog.com \
    --cc=stable@vger.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.