[PATCH] iio: proximity: vl53l1x: Fix trigger reference leak in vl53l1x_probe()

[PATCH] iio: proximity: vl53l1x: Fix trigger reference leak in vl53l1x_probe()

[Wentao Liang]

The reference taken with iio_trigger_get() is only dropped by
iio_dev_release() when INDIO_BUFFER_TRIGGERED is set. Failure of
vl53l1x_configure_irq() or of triggered buffer setup returns before
that mode is set and leaks the reference acquired for
indio_dev->trig. Move the iio_trigger_get() after those setup steps
succeed.

Fixes: 128e5ebec856 ("iio: proximity: add driver for ST VL53L1X ToF sensor")
Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
---
 drivers/iio/proximity/vl53l1x-i2c.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/iio/proximity/vl53l1x-i2c.c b/drivers/iio/proximity/vl53l1x-i2c.c
index 4d9cb3983dba..f1b8ff7fac09 100644
--- a/drivers/iio/proximity/vl53l1x-i2c.c
+++ b/drivers/iio/proximity/vl53l1x-i2c.c
@@ -713,8 +713,6 @@ static int vl53l1x_probe(struct i2c_client *client)
 		if (ret)
 			return ret;
 
-		indio_dev->trig = iio_trigger_get(trig);
-
 		ret = vl53l1x_configure_irq(dev, client->irq, indio_dev);
 		if (ret)
 			return ret;
@@ -724,6 +722,8 @@ static int vl53l1x_probe(struct i2c_client *client)
 						      NULL);
 		if (ret)
 			return ret;
+
+		indio_dev->trig = iio_trigger_get(trig);
 	}
 
 	return devm_iio_device_register(dev, indio_dev);
-- 
2.34.1

Re: [PATCH] iio: proximity: vl53l1x: Fix trigger reference leak in vl53l1x_probe()

[Jonathan Cameron]

On Wed, 16 Sep 2026 16:42:55 +0000
Wentao Liang <vulab@iscas.ac.cn> wrote:

> The reference taken with iio_trigger_get() is only dropped by
> iio_dev_release() when INDIO_BUFFER_TRIGGERED is set. Failure of
> vl53l1x_configure_irq() or of triggered buffer setup returns before
> that mode is set and leaks the reference acquired for
> indio_dev->trig. Move the iio_trigger_get() after those setup steps
> succeed.
> 
> Fixes: 128e5ebec856 ("iio: proximity: add driver for ST VL53L1X ToF sensor")
> Signed-off-by: Wentao Liang <vulab@iscas.ac.cn>
Not this way given the subtle ordering constraint it is relying on.

See other threads on same topic.


> ---
>  drivers/iio/proximity/vl53l1x-i2c.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/iio/proximity/vl53l1x-i2c.c b/drivers/iio/proximity/vl53l1x-i2c.c
> index 4d9cb3983dba..f1b8ff7fac09 100644
> --- a/drivers/iio/proximity/vl53l1x-i2c.c
> +++ b/drivers/iio/proximity/vl53l1x-i2c.c
> @@ -713,8 +713,6 @@ static int vl53l1x_probe(struct i2c_client *client)
>  		if (ret)
>  			return ret;
>  
> -		indio_dev->trig = iio_trigger_get(trig);
> -
>  		ret = vl53l1x_configure_irq(dev, client->irq, indio_dev);
>  		if (ret)
>  			return ret;
> @@ -724,6 +722,8 @@ static int vl53l1x_probe(struct i2c_client *client)
>  						      NULL);
>  		if (ret)
>  			return ret;
> +
> +		indio_dev->trig = iio_trigger_get(trig);
>  	}
>  
>  	return devm_iio_device_register(dev, indio_dev);