Linux kernel -stable discussions
 help / color / mirror / Atom feed
From: Lee Jones <lee@kernel.org>
To: lee@kernel.org, "Jonathan Cameron" <jic23@kernel.org>,
	"David Lechner" <dlechner@baylibre.com>,
	"Nuno Sá" <nuno.sa@analog.com>,
	"Andy Shevchenko" <andy@kernel.org>,
	"Joe Sandom" <joe.g.sandom@gmail.com>,
	linux-iio@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Subject: [PATCH 10/10] iio: light: tsl2591: Prevent infinite recursion on threshold boundaries
Date: Thu, 19 Nov 2026 15:30:43 +0000	[thread overview]
Message-ID: <20261119153151.1397003-11-lee@kernel.org> (raw)
In-Reply-To: <20261119153151.1397003-1-lee@kernel.org>

tsl2591_set_als_lower_threshold() adjusts the upper threshold to
als_lower_threshold + 1 whenever the new lower threshold is greater than
or equal to the current upper threshold, and
tsl2591_set_als_upper_threshold() symmetrically adjusts the lower
threshold to als_upper_threshold - 1.

Writing 65535 (TSL2591_ALS_MAX_VALUE) to the falling threshold wraps the
16-bit addition to 0 and calls tsl2591_set_als_upper_threshold(chip, 0),
which then wraps 0 - 1 back to 65535 and calls
tsl2591_set_als_lower_threshold(chip, 65535) in an infinite mutual
recursion until the kernel stack overflows.  Writing 0 to the rising
threshold triggers the same cycle whenever the lower threshold is
non-zero.

Reject als_lower_threshold == TSL2591_ALS_MAX_VALUE and
als_upper_threshold == 0 with -EINVAL, propagate errors from the
cross-calls, and only update chip->als_settings once the I2C writes
succeed.

Fixes: 2335f0d7c790 ("iio: light: Added AMS tsl2591 driver implementation")
Closes: https://sashiko.dev/#/bug/linux-29f0f993-c799-4717-9daa-d0ad367f4e6d
Cc: stable@vger.kernel.org
Signed-off-by: Lee Jones <lee@kernel.org>
---
 drivers/iio/light/tsl2591.c | 25 +++++++++++++++----------
 1 file changed, 15 insertions(+), 10 deletions(-)

diff --git a/drivers/iio/light/tsl2591.c b/drivers/iio/light/tsl2591.c
index 8cfce720efb9..e0c2b67c7dd4 100644
--- a/drivers/iio/light/tsl2591.c
+++ b/drivers/iio/light/tsl2591.c
@@ -466,23 +466,25 @@ static int tsl2591_set_als_gain_int_time(struct tsl2591_chip *chip)
 static int tsl2591_set_als_lower_threshold(struct tsl2591_chip *chip,
 					   u16 als_lower_threshold)
 {
-	struct tsl2591_als_settings als_settings = chip->als_settings;
 	struct i2c_client *client = chip->client;
 	u16 als_upper_threshold;
 	u8 als_lower_l;
 	u8 als_lower_h;
 	int ret;
 
-	chip->als_settings.als_lower_thresh = als_lower_threshold;
+	if (als_lower_threshold == TSL2591_ALS_MAX_VALUE)
+		return -EINVAL;
 
 	/*
 	 * Lower threshold should not be greater or equal to upper.
 	 * If this is the case, then assert upper threshold to new lower
 	 * threshold + 1 to avoid ordering issues when setting thresholds.
 	 */
-	if (als_lower_threshold >= als_settings.als_upper_thresh) {
+	if (als_lower_threshold >= chip->als_settings.als_upper_thresh) {
 		als_upper_threshold = als_lower_threshold + 1;
-		tsl2591_set_als_upper_threshold(chip, als_upper_threshold);
+		ret = tsl2591_set_als_upper_threshold(chip, als_upper_threshold);
+		if (ret)
+			return ret;
 	}
 
 	als_lower_l = als_lower_threshold;
@@ -504,32 +506,33 @@ static int tsl2591_set_als_lower_threshold(struct tsl2591_chip *chip,
 		return ret;
 	}
 
+	chip->als_settings.als_lower_thresh = als_lower_threshold;
+
 	return 0;
 }
 
 static int tsl2591_set_als_upper_threshold(struct tsl2591_chip *chip,
 					   u16 als_upper_threshold)
 {
-	struct tsl2591_als_settings als_settings = chip->als_settings;
 	struct i2c_client *client = chip->client;
 	u16 als_lower_threshold;
 	u8 als_upper_l;
 	u8 als_upper_h;
 	int ret;
 
-	if (als_upper_threshold > TSL2591_ALS_MAX_VALUE)
+	if (!als_upper_threshold)
 		return -EINVAL;
 
-	chip->als_settings.als_upper_thresh = als_upper_threshold;
-
 	/*
 	 * Upper threshold should not be less than lower. If this
 	 * is the case, then assert lower threshold to new upper
 	 * threshold - 1 to avoid ordering issues when setting thresholds.
 	 */
-	if (als_upper_threshold < als_settings.als_lower_thresh) {
+	if (als_upper_threshold < chip->als_settings.als_lower_thresh) {
 		als_lower_threshold = als_upper_threshold - 1;
-		tsl2591_set_als_lower_threshold(chip, als_lower_threshold);
+		ret = tsl2591_set_als_lower_threshold(chip, als_lower_threshold);
+		if (ret)
+			return ret;
 	}
 
 	als_upper_l = als_upper_threshold;
@@ -551,6 +554,8 @@ static int tsl2591_set_als_upper_threshold(struct tsl2591_chip *chip,
 		return ret;
 	}
 
+	chip->als_settings.als_upper_thresh = als_upper_threshold;
+
 	return 0;
 }
 
-- 
2.56.1.708.g77570a6a1d-goog


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

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20261119153151.1397003-1-lee@kernel.org>
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 15:30 ` [PATCH 03/10] iio: accel: adxl313: Reject sub-base ODR codes in adxl313_read_raw() Lee Jones
2026-11-19 15:30 ` [PATCH 04/10] iio: adc: stm32-adc: Validate channel index before writing chan_name Lee Jones
2026-11-19 15:30 ` [PATCH 05/10] iio: adc: stm32-adc: Detach chained IRQ handler before removing domain Lee Jones
2026-11-19 15:30 ` [PATCH 06/10] iio: adc: pac1934: Fix custom attribute allocation and channel bounds Lee Jones
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 15:30 ` [PATCH 08/10] iio: adc: qcom-spmi-adc5-gen3: Reject empty reg property in probe Lee Jones
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 15:30 ` Lee Jones [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=20261119153151.1397003-11-lee@kernel.org \
    --to=lee@kernel.org \
    --cc=andy@kernel.org \
    --cc=dlechner@baylibre.com \
    --cc=jic23@kernel.org \
    --cc=joe.g.sandom@gmail.com \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox