Linux Media Controller development
 help / color / mirror / Atom feed
From: Jonathan Cameron <jic23@kernel.org>
To: linux-iio@vger.kernel.org,
	"David Lechner" <dlechner@baylibre.com>,
	"Nuno Sá" <nuno.sa@analog.com>,
	"Andy Shevchenko" <andy@kernel.org>
Cc: linux-kernel@vger.kernel.org,
	Martin Tuma <martin.tuma@digiteqautomotive.com>,
	Mauro Carvalho Chehab <mchehab@kernel.org>,
	linux-media@vger.kernel.org,
	Gustavo Silva <gustavograzs@gmail.com>,
	Marcelo Schmitt <marcelo.schmitt@analog.com>,
	Antoniu Miclaus <antoniu.miclaus@analog.com>,
	Michael Hennerich <Michael.Hennerich@analog.com>,
	Ramona Alexandra Nechita <ramona.nechita@analog.com>,
	Tomislav Denis <tomislav.denis@avl.com>,
	Jorge Marques <jorge.marques@analog.com>,
	Petre Rodan <petre.rodan@subdimension.ro>,
	Dan Robertson <dan@dlrobertson.com>,
	Jianping Shen <Jianping.Shen@de.bosch.com>,
	Gwendal Grignou <gwendal@chromium.org>,
	Maxwell Doose <maxwell@maxwelld.cc>,
	Tomasz Duszynski <tduszyns@gmail.com>,
	Esben Haabendal <esben@geanix.com>,
	Narcisa Ana Maria Vasile <narcisaanamaria12@gmail.com>,
	Jiri Kosina <jikos@kernel.org>,
	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
	Vasileios Amoiridis <vassilisamir@gmail.com>,
	Abhash Jha <abhashkumarjha123@gmail.com>,
	Puranjay Mohan <puranjay@kernel.org>,
	Nishant Malpani <nish.malpani25@gmail.com>,
	Oleksij Rempel <o.rempel@pengutronix.de>,
	Linus Walleij <linusw@kernel.org>,
	Jonathan Cameron <jonathan.cameron@oss.qualcomm.com>
Subject: [PATCH 11/35] iio: temperature: tmp006: use default_trigger
Date: Mon, 16 Nov 2026 01:47:59 +0000	[thread overview]
Message-ID: <20261116014823.3132576-12-jic23@kernel.org> (raw)
In-Reply-To: <20261116014823.3132576-1-jic23@kernel.org>

From: Jonathan Cameron <jonathan.cameron@oss.qualcomm.com>

Set indio_dev->default_trigger rather than taking a reference to the
trigger in probe(). The IIO core now takes the reference during
iio_device_register(), so it is not leaked if probe() fails after
the trigger is set up. That leak can occur in this driver, but more
generally the intent is to avoid fragile ordering constraints.

The copy of the trigger pointer in data->drdy_trig is only used during
probe(), so replace it with a local variable.

Fixes: 91f75ccf9f03 ("iio: temperature: tmp006: add triggered buffer support")
Signed-off-by: Jonathan Cameron <jonathan.cameron@oss.qualcomm.com>
---
This one is a fix, but I'm not planning to push for backport given
the impact is a reference and resulting leak of data in an unlikely
error path only.
---
 drivers/iio/temperature/tmp006.c | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/drivers/iio/temperature/tmp006.c b/drivers/iio/temperature/tmp006.c
index d9f6449ec0d8..51196ea9211d 100644
--- a/drivers/iio/temperature/tmp006.c
+++ b/drivers/iio/temperature/tmp006.c
@@ -45,7 +45,6 @@
 struct tmp006_data {
 	struct i2c_client *client;
 	u16 config;
-	struct iio_trigger *drdy_trig;
 };
 
 static int tmp006_read_measurement(struct tmp006_data *data, u8 reg)
@@ -297,6 +296,7 @@ static int tmp006_probe(struct i2c_client *client)
 {
 	struct iio_dev *indio_dev;
 	struct tmp006_data *data;
+	struct iio_trigger *trig;
 	int ret;
 
 	if (!i2c_check_functionality(client->adapter, I2C_FUNC_SMBUS_WORD_DATA))
@@ -340,25 +340,23 @@ static int tmp006_probe(struct i2c_client *client)
 		return ret;
 
 	if (client->irq > 0) {
-		data->drdy_trig = devm_iio_trigger_alloc(&client->dev,
-							 "%s-dev%d",
-							 indio_dev->name,
-							 iio_device_id(indio_dev));
-		if (!data->drdy_trig)
+		trig = devm_iio_trigger_alloc(&client->dev, "%s-dev%d",
+					      indio_dev->name,
+					      iio_device_id(indio_dev));
+		if (!trig)
 			return -ENOMEM;
 
-		data->drdy_trig->ops = &tmp006_trigger_ops;
-		iio_trigger_set_drvdata(data->drdy_trig, indio_dev);
-		ret = devm_iio_trigger_register(&client->dev, data->drdy_trig);
+		trig->ops = &tmp006_trigger_ops;
+		iio_trigger_set_drvdata(trig, indio_dev);
+		ret = devm_iio_trigger_register(&client->dev, trig);
 		if (ret)
 			return ret;
 
-		indio_dev->trig = iio_trigger_get(data->drdy_trig);
+		indio_dev->default_trigger = trig;
 
 		ret = devm_request_irq(&client->dev, client->irq,
 				       iio_trigger_generic_data_rdy_poll,
-				       IRQF_NO_THREAD, "tmp006_irq",
-				       data->drdy_trig);
+				       IRQF_NO_THREAD, "tmp006_irq", trig);
 		if (ret < 0)
 			return ret;
 	}
-- 
2.56.1


  parent reply	other threads:[~2026-11-16  1:49 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-16  1:47 [PATCH 00/35] iio: closing default trigger handling leaks Jonathan Cameron
2026-11-16  1:47 ` [PATCH 01/35] iio: core: add default_trigger and take reference in iio_device_register() Jonathan Cameron
2026-11-16  1:47 ` [PATCH 02/35] media: pci: mgb4: use IIO default_trigger Jonathan Cameron
2026-11-16  1:47 ` [PATCH 03/35] iio: chemical: ens160: use default_trigger Jonathan Cameron
2026-11-16  1:47 ` [PATCH 04/35] iio: adc: ad4130: " Jonathan Cameron
2026-11-16  1:47 ` [PATCH 05/35] iio: adc: ad4170-4: " Jonathan Cameron
2026-11-16  1:47 ` [PATCH 06/35] iio: adc: ad7768-1: " Jonathan Cameron
2026-11-16  1:47 ` [PATCH 07/35] iio: adc: ad7779: " Jonathan Cameron
2026-11-16  1:47 ` [PATCH 08/35] iio: adc: ti-ads131e08: " Jonathan Cameron
2026-11-16  1:47 ` [PATCH 09/35] iio: addac: ad74115: " Jonathan Cameron
2026-11-16  1:47 ` [PATCH 10/35] iio: addac: ad74413r: " Jonathan Cameron
2026-11-16  1:47 ` Jonathan Cameron [this message]
2026-11-16  1:48 ` [PATCH 12/35] iio: adc: ad4062: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 13/35] iio: accel: bma220: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 14/35] iio: accel: bma400: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 15/35] iio: imu: smi330: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 16/35] iio: light: acpi-als: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 17/35] iio: chemical: scd30: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 18/35] iio: accel: bma180: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 19/35] iio: accel: kxcjk-1013: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 20/35] iio: accel: mma8452: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 21/35] iio: chemical: ccs811: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 22/35] iio: pressure: mpl3115: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 23/35] iio: common: st_sensors: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 24/35] iio: common: hid-sensors: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 25/35] iio: pressure: bmp280: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 26/35] iio: light: vl6180: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 27/35] iio: gyro: itg3200: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 28/35] iio: imu: bmi160: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 29/35] iio: accel: adxl355: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 30/35] iio: gyro: adxrs290: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 31/35] iio: accel: adxl372: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 32/35] iio: light: si1145: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 33/35] iio: adc: ti-tsc2046: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 34/35] iio: accel: mxc4005: " Jonathan Cameron
2026-11-16  1:48 ` [PATCH 35/35] iio: gyro: mpu3050: " Jonathan Cameron

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=20261116014823.3132576-12-jic23@kernel.org \
    --to=jic23@kernel.org \
    --cc=Jianping.Shen@de.bosch.com \
    --cc=Michael.Hennerich@analog.com \
    --cc=abhashkumarjha123@gmail.com \
    --cc=andy@kernel.org \
    --cc=antoniu.miclaus@analog.com \
    --cc=dan@dlrobertson.com \
    --cc=dlechner@baylibre.com \
    --cc=esben@geanix.com \
    --cc=gustavograzs@gmail.com \
    --cc=gwendal@chromium.org \
    --cc=jikos@kernel.org \
    --cc=jonathan.cameron@oss.qualcomm.com \
    --cc=jorge.marques@analog.com \
    --cc=linusw@kernel.org \
    --cc=linux-iio@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-media@vger.kernel.org \
    --cc=marcelo.schmitt@analog.com \
    --cc=martin.tuma@digiteqautomotive.com \
    --cc=maxwell@maxwelld.cc \
    --cc=mchehab@kernel.org \
    --cc=narcisaanamaria12@gmail.com \
    --cc=nish.malpani25@gmail.com \
    --cc=nuno.sa@analog.com \
    --cc=o.rempel@pengutronix.de \
    --cc=petre.rodan@subdimension.ro \
    --cc=puranjay@kernel.org \
    --cc=ramona.nechita@analog.com \
    --cc=srinivas.pandruvada@linux.intel.com \
    --cc=tduszyns@gmail.com \
    --cc=tomislav.denis@avl.com \
    --cc=vassilisamir@gmail.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