Skip to content

Commit

Permalink
iio:humidity:hts221: rearrange iio trigger get and register
Browse files Browse the repository at this point in the history
IIO trigger interface function iio_trigger_get() should be called after
iio_trigger_register() (or its devm analogue) strictly, because of
iio_trigger_get() acquires module refcnt based on the trigger->owner
pointer, which is initialized inside iio_trigger_register() to
THIS_MODULE.
If this call order is wrong, the next iio_trigger_put() (from sysfs
callback or "delete module" path) will dereference "default" module
refcnt, which is incorrect behaviour.

Fixes: e4a70e3 ("iio: humidity: add support to hts221 rh/temp combo device")
Signed-off-by: Dmitry Rokosov <ddrokosov@sberdevices.ru>
Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com>
Link: https://lore.kernel.org/r/20220524181150.9240-6-ddrokosov@sberdevices.ru
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
  • Loading branch information
Dmitry Rokosov authored and Jonathan Cameron committed Jun 19, 2022
1 parent d710359 commit 10b9c2c
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion drivers/iio/humidity/hts221_buffer.c
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,12 @@ int hts221_allocate_trigger(struct iio_dev *iio_dev)

iio_trigger_set_drvdata(hw->trig, iio_dev);
hw->trig->ops = &hts221_trigger_ops;

err = devm_iio_trigger_register(hw->dev, hw->trig);

iio_dev->trig = iio_trigger_get(hw->trig);

return devm_iio_trigger_register(hw->dev, hw->trig);
return err;
}

static int hts221_buffer_preenable(struct iio_dev *iio_dev)
Expand Down

0 comments on commit 10b9c2c

Please sign in to comment.