iio: potentiostat: lmp91000: fix probe order and cleanup paths
PATCH v3 1/1 iio: potentiostat: lmp91000: fix probe order and cleanup paths
Fix the initialization order in lmp91000_probe() where the immutable trigger is set before data->cb_buffer is initialized, which would cause a NULL pointer dereference.
Also, reorder the cleanup labels and ensure all error paths properly unwind resources using gotos instead of direct returns, following the standard LIFO resource release order.
--- drivers/iio/potentiostat/lmp91000.c | 34 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 18 deletions(-)
drivers/iio/potentiostat/lmp91000.c +16 -18
@@ -330,17 +330,27 @@ static int lmp91000_probe(struct i2c_client *client)if (ret)return ret; + data->cb_buffer =iio_channel_get_all_cb (dev, &lmp91000_buffer_cb, indio_dev); +if (IS_ERR (data->cb_buffer)) { +if (PTR_ERR (data->cb_buffer) == -ENODEV ) + ret = -EPROBE_DEFER ; +else + ret =PTR_ERR (data->cb_buffer); + + goto error_unreg_buffer; + } + ret =iio_trigger_set_immutable (iio_channel_cb_get_iio_dev (data->cb_buffer), data->trig);if (ret) {dev_err (dev,"cannot set immutable trigger.\n" ); -return ret; + goto error_unreg_cb_buffer; } ret =iio_trigger_register (data->trig);if (ret) {dev_err (dev,"cannot register iio trigger.\n" ); -return ret; + goto error_unreg_cb_buffer; } ret = iio_triggered_buffer_setup(indio_dev, NULL,
@@ -349,35 +359,23 @@ static int lmp91000_probe(struct i2c_client *client)if (ret) goto error_unreg_trigger; - data->cb_buffer =iio_channel_get_all_cb (dev, &lmp91000_buffer_cb, - indio_dev); - -if (IS_ERR (data->cb_buffer)) { -if (PTR_ERR (data->cb_buffer) == -ENODEV ) - ret = -EPROBE_DEFER ; -else - ret =PTR_ERR (data->cb_buffer); - - goto error_unreg_buffer; - } - data->adc_chan =iio_channel_cb_get_channels (data->cb_buffer); ret =iio_device_register (indio_dev);if (ret) - goto error_unreg_cb_buffer; + goto error_unreg_trigger;return 0 ; +error_unreg_trigger: +iio_trigger_unregister (data->trig); + error_unreg_cb_buffer:iio_channel_release_all_cb (data->cb_buffer); error_unreg_buffer:iio_triggered_buffer_cleanup (indio_dev); -error_unreg_trigger: -iio_trigger_unregister (data->trig); -return ret; }
Signature · 1 line
2.43.0
Jonathan Cameron
maintainerQuoted 10 lines · On Thu, 14 May 2026 09:08:46 +0100 Salah Triki <[email protected]> wrote:
Fix the initialization order in
lmp91000_probe()where the immutable trigger is set beforedata->cb_bufferis initialized, which would cause a NULL pointer dereference.Also, reorder the cleanup labels and ensure all error paths properly unwind resources using gotos instead of direct returns, following the standard LIFO resource release order.
Fixes 67e17300dc1d ("iio: potentiostat: add LMP91000 support")Signed-off-by Salah Triki <[email protected]>
https://sashiko.dev/#/patchset/20260514080847.296285-1-salah.triki%40gmail.com
Is correct wrt to the error path being wrong. Remove also needs fixing up.
Quoted 10 lines
--- drivers/iio/potentiostat/lmp91000.c | 34 ++++++++++++++--------------- 1 file changed, 16 insertions(+), 18 deletions(-)drivers/iio/potentiostat/lmp91000.c +0
-0@@ -330,17 +330,27 @@ static int lmp91000_probe(struct i2c_client *client)if (ret)
drivers/iio/potentiostat/lmp91000.c static int lmp91000_probe(struct i2c_client *client) · line 340
Quoted 10 lines
drivers/iio/potentiostat/lmp91000.c +8
-0return ret; + data->cb_buffer =iio_channel_get_all_cb (dev, &lmp91000_buffer_cb, indio_dev); +if (IS_ERR (data->cb_buffer)) { +if (PTR_ERR (data->cb_buffer) == -ENODEV ) + ret = -EPROBE_DEFER ; +else + ret =PTR_ERR (data->cb_buffer); + + goto error_unreg_buffer;
At this point the buffer hasn't been registered -so shouldn't do that.
In fact nothing that is not handled with devm_ unwinding has happened yet. So returning is fine I believe.
drivers/iio/potentiostat/lmp91000.c static int lmp91000_probe(struct i2c_client *client) · line 347
Quoted 8 lines
drivers/iio/potentiostat/lmp91000.c +3
-1+ } + ret =iio_trigger_set_immutable (iio_channel_cb_get_iio_dev (data->cb_buffer), data->trig);if (ret) {dev_err (dev,"cannot set immutable trigger.\n" ); -return ret; + goto error_unreg_cb_buffer;
At this point we just need to undo the get_all_cb(). So indicates the unwind order below is wrong.
Quoted 23 lines
drivers/iio/potentiostat/lmp91000.c +1
-1} ret =iio_trigger_register (data->trig);if (ret) {dev_err (dev,"cannot register iio trigger.\n" ); -return ret; + goto error_unreg_cb_buffer; }drivers/iio/potentiostat/lmp91000.c +0
-8ret = iio_triggered_buffer_setup(indio_dev, NULL,@@ -349,35 +359,23 @@ static int lmp91000_probe(struct i2c_client *client)if (ret) goto error_unreg_trigger; - data->cb_buffer =iio_channel_get_all_cb (dev, &lmp91000_buffer_cb, - indio_dev); - -if (IS_ERR (data->cb_buffer)) { -if (PTR_ERR (data->cb_buffer) == -ENODEV ) - ret = -EPROBE_DEFER ; -else - ret =PTR_ERR (data->cb_buffer);
drivers/iio/potentiostat/lmp91000.c static int lmp91000_probe(struct i2c_client *client) · line 366
Quoted 10 lines
drivers/iio/potentiostat/lmp91000.c +1
-5- - goto error_unreg_buffer; - } - data->adc_chan =iio_channel_cb_get_channels (data->cb_buffer); ret =iio_device_register (indio_dev);if (ret) - goto error_unreg_cb_buffer; + goto error_unreg_trigger;
That doesn't smell right either. The most recent thing to undo after
the reorg is triggered_buffer_cleanup().
Take a very close look at the ordering.
drivers/iio/potentiostat/lmp91000.c static int lmp91000_probe(struct i2c_client *client) · line 377
Quoted 11 lines
drivers/iio/potentiostat/lmp91000.c +3
-0return 0 ; +error_unreg_trigger: +iio_trigger_unregister (data->trig); + error_unreg_cb_buffer:iio_channel_release_all_cb (data->cb_buffer); error_unreg_buffer:iio_triggered_buffer_cleanup (indio_dev);
As per the above. These are in the wrong order - they need to unwind in reverse of above. That means that error_unreg_cb_buffer belongs down here (1st thing setup above).
drivers/iio/potentiostat/lmp91000.c static int lmp91000_probe(struct i2c_client *client) · line 381
Quoted 7 lines
drivers/iio/potentiostat/lmp91000.c +0
-3-error_unreg_trigger: -iio_trigger_unregister (data->trig); -return ret; }
I've also clearly been dozing whilst reading this -> If you move stuff in probe order, then you need to move it in remove to unwind in the opposite order. It might not be a bug to not do so, but it is harder to reason about.
So remove should be (I think)
iio_device_unregister()
iio_channel_stop_all_cb() // kind of unwinds cb_get_channels()? //I'm fairly sure that isn't needed as all paths that turned it on will // have been unwound before we get to here - but can't test - so lets // leave it in place.
iio_triggered_buffer_cleanup()iio_trigger_unregister()iio_channel_release_all_cb()
Anyhow, take a close at those flows and convince yourself your updated patch does everything in error and remove paths in the correct order.
Jonathan