From: Greg Kroah-Hartman Date: Mon, 27 Jun 2022 09:17:35 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v5.4.202~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6154fc2156b1ab4436785b305b5f3a2326eab70d;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: iio-accel-bma180-rearrange-iio-trigger-get-and-register.patch iio-accel-mma8452-ignore-the-return-value-of-reset-operation.patch iio-accel-mxc4005-rearrange-iio-trigger-get-and-register.patch iio-adc-stm32-fix-maximum-clock-rate-for-stm32mp15x.patch iio-chemical-ccs811-rearrange-iio-trigger-get-and-register.patch iio-gyro-mpu3050-fix-the-error-handling-in-mpu3050_power_up.patch iio-trigger-sysfs-fix-use-after-free-on-remove.patch --- diff --git a/queue-5.4/iio-accel-bma180-rearrange-iio-trigger-get-and-register.patch b/queue-5.4/iio-accel-bma180-rearrange-iio-trigger-get-and-register.patch new file mode 100644 index 00000000000..bbcc76cfb9b --- /dev/null +++ b/queue-5.4/iio-accel-bma180-rearrange-iio-trigger-get-and-register.patch @@ -0,0 +1,45 @@ +From e5f3205b04d7f95a2ef43bce4b454a7f264d6923 Mon Sep 17 00:00:00 2001 +From: Dmitry Rokosov +Date: Tue, 24 May 2022 18:14:39 +0000 +Subject: iio:accel:bma180: rearrange iio trigger get and register + +From: Dmitry Rokosov + +commit e5f3205b04d7f95a2ef43bce4b454a7f264d6923 upstream. + +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: 0668a4e4d297 ("iio: accel: bma180: Fix indio_dev->trig assignment") +Signed-off-by: Dmitry Rokosov +Reviewed-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20220524181150.9240-2-ddrokosov@sberdevices.ru +Cc: +Signed-off-by: Jonathan Cameron +Signed-off-by: Greg Kroah-Hartman +--- + drivers/iio/accel/bma180.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/iio/accel/bma180.c ++++ b/drivers/iio/accel/bma180.c +@@ -793,11 +793,12 @@ static int bma180_probe(struct i2c_clien + data->trig->dev.parent = &client->dev; + data->trig->ops = &bma180_trigger_ops; + iio_trigger_set_drvdata(data->trig, indio_dev); +- indio_dev->trig = iio_trigger_get(data->trig); + + ret = iio_trigger_register(data->trig); + if (ret) + goto err_trigger_free; ++ ++ indio_dev->trig = iio_trigger_get(data->trig); + } + + ret = iio_triggered_buffer_setup(indio_dev, NULL, diff --git a/queue-5.4/iio-accel-mma8452-ignore-the-return-value-of-reset-operation.patch b/queue-5.4/iio-accel-mma8452-ignore-the-return-value-of-reset-operation.patch new file mode 100644 index 00000000000..17be7ad71d8 --- /dev/null +++ b/queue-5.4/iio-accel-mma8452-ignore-the-return-value-of-reset-operation.patch @@ -0,0 +1,44 @@ +From bf745142cc0a3e1723f9207fb0c073c88464b7b4 Mon Sep 17 00:00:00 2001 +From: Haibo Chen +Date: Wed, 15 Jun 2022 19:31:58 +0800 +Subject: iio: accel: mma8452: ignore the return value of reset operation + +From: Haibo Chen + +commit bf745142cc0a3e1723f9207fb0c073c88464b7b4 upstream. + +On fxls8471, after set the reset bit, the device will reset immediately, +will not give ACK. So ignore the return value of this reset operation, +let the following code logic to check whether the reset operation works. + +Signed-off-by: Haibo Chen +Fixes: ecabae713196 ("iio: mma8452: Initialise before activating") +Reviewed-by: Hans de Goede +Link: https://lore.kernel.org/r/1655292718-14287-1-git-send-email-haibo.chen@nxp.com +Cc: +Signed-off-by: Jonathan Cameron +Signed-off-by: Greg Kroah-Hartman +--- + drivers/iio/accel/mma8452.c | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +--- a/drivers/iio/accel/mma8452.c ++++ b/drivers/iio/accel/mma8452.c +@@ -1489,10 +1489,14 @@ static int mma8452_reset(struct i2c_clie + int i; + int ret; + +- ret = i2c_smbus_write_byte_data(client, MMA8452_CTRL_REG2, ++ /* ++ * Find on fxls8471, after config reset bit, it reset immediately, ++ * and will not give ACK, so here do not check the return value. ++ * The following code will read the reset register, and check whether ++ * this reset works. ++ */ ++ i2c_smbus_write_byte_data(client, MMA8452_CTRL_REG2, + MMA8452_CTRL_REG2_RST); +- if (ret < 0) +- return ret; + + for (i = 0; i < 10; i++) { + usleep_range(100, 200); diff --git a/queue-5.4/iio-accel-mxc4005-rearrange-iio-trigger-get-and-register.patch b/queue-5.4/iio-accel-mxc4005-rearrange-iio-trigger-get-and-register.patch new file mode 100644 index 00000000000..70ec83d5e09 --- /dev/null +++ b/queue-5.4/iio-accel-mxc4005-rearrange-iio-trigger-get-and-register.patch @@ -0,0 +1,49 @@ +From 9354c224c9b4f55847a0de3e968cba2ebf15af3b Mon Sep 17 00:00:00 2001 +From: Dmitry Rokosov +Date: Tue, 24 May 2022 18:14:43 +0000 +Subject: iio:accel:mxc4005: rearrange iio trigger get and register + +From: Dmitry Rokosov + +commit 9354c224c9b4f55847a0de3e968cba2ebf15af3b upstream. + +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: 47196620c82f ("iio: mxc4005: add data ready trigger for mxc4005") +Signed-off-by: Dmitry Rokosov +Reviewed-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20220524181150.9240-4-ddrokosov@sberdevices.ru +Cc: +Signed-off-by: Jonathan Cameron +Signed-off-by: Greg Kroah-Hartman +--- + drivers/iio/accel/mxc4005.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/iio/accel/mxc4005.c ++++ b/drivers/iio/accel/mxc4005.c +@@ -462,8 +462,6 @@ static int mxc4005_probe(struct i2c_clie + data->dready_trig->dev.parent = &client->dev; + data->dready_trig->ops = &mxc4005_trigger_ops; + iio_trigger_set_drvdata(data->dready_trig, indio_dev); +- indio_dev->trig = data->dready_trig; +- iio_trigger_get(indio_dev->trig); + ret = devm_iio_trigger_register(&client->dev, + data->dready_trig); + if (ret) { +@@ -471,6 +469,8 @@ static int mxc4005_probe(struct i2c_clie + "failed to register trigger\n"); + return ret; + } ++ ++ indio_dev->trig = iio_trigger_get(data->dready_trig); + } + + return devm_iio_device_register(&client->dev, indio_dev); diff --git a/queue-5.4/iio-adc-stm32-fix-maximum-clock-rate-for-stm32mp15x.patch b/queue-5.4/iio-adc-stm32-fix-maximum-clock-rate-for-stm32mp15x.patch new file mode 100644 index 00000000000..75331ebb5e4 --- /dev/null +++ b/queue-5.4/iio-adc-stm32-fix-maximum-clock-rate-for-stm32mp15x.patch @@ -0,0 +1,34 @@ +From 990539486e7e311fb5dab1bf4d85d1a8973ae644 Mon Sep 17 00:00:00 2001 +From: Olivier Moysan +Date: Thu, 9 Jun 2022 11:52:34 +0200 +Subject: iio: adc: stm32: fix maximum clock rate for stm32mp15x + +From: Olivier Moysan + +commit 990539486e7e311fb5dab1bf4d85d1a8973ae644 upstream. + +Change maximum STM32 ADC input clock rate to 36MHz, as specified +in STM32MP15x datasheets. + +Fixes: d58c67d1d851 ("iio: adc: stm32-adc: add support for STM32MP1") +Signed-off-by: Olivier Moysan +Reviewed-by: Fabrice Gasnier +Link: https://lore.kernel.org/r/20220609095234.375925-1-olivier.moysan@foss.st.com +Cc: +Signed-off-by: Jonathan Cameron +Signed-off-by: Greg Kroah-Hartman +--- + drivers/iio/adc/stm32-adc-core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/iio/adc/stm32-adc-core.c ++++ b/drivers/iio/adc/stm32-adc-core.c +@@ -815,7 +815,7 @@ static const struct stm32_adc_priv_cfg s + static const struct stm32_adc_priv_cfg stm32mp1_adc_priv_cfg = { + .regs = &stm32h7_adc_common_regs, + .clk_sel = stm32h7_adc_clk_sel, +- .max_clk_rate_hz = 40000000, ++ .max_clk_rate_hz = 36000000, + .has_syscfg = HAS_VBOOSTER | HAS_ANASWVDD, + .num_irqs = 2, + }; diff --git a/queue-5.4/iio-chemical-ccs811-rearrange-iio-trigger-get-and-register.patch b/queue-5.4/iio-chemical-ccs811-rearrange-iio-trigger-get-and-register.patch new file mode 100644 index 00000000000..48c048cc7c7 --- /dev/null +++ b/queue-5.4/iio-chemical-ccs811-rearrange-iio-trigger-get-and-register.patch @@ -0,0 +1,45 @@ +From d710359c0b445e8c03e24f19ae2fb79ce7282260 Mon Sep 17 00:00:00 2001 +From: Dmitry Rokosov +Date: Tue, 24 May 2022 18:14:45 +0000 +Subject: iio:chemical:ccs811: rearrange iio trigger get and register + +From: Dmitry Rokosov + +commit d710359c0b445e8c03e24f19ae2fb79ce7282260 upstream. + +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: f1f065d7ac30 ("iio: chemical: ccs811: Add support for data ready trigger") +Signed-off-by: Dmitry Rokosov +Reviewed-by: Andy Shevchenko +Link: https://lore.kernel.org/r/20220524181150.9240-5-ddrokosov@sberdevices.ru +Cc: +Signed-off-by: Jonathan Cameron +Signed-off-by: Greg Kroah-Hartman +--- + drivers/iio/chemical/ccs811.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/drivers/iio/chemical/ccs811.c ++++ b/drivers/iio/chemical/ccs811.c +@@ -418,11 +418,11 @@ static int ccs811_probe(struct i2c_clien + data->drdy_trig->dev.parent = &client->dev; + data->drdy_trig->ops = &ccs811_trigger_ops; + iio_trigger_set_drvdata(data->drdy_trig, indio_dev); +- indio_dev->trig = data->drdy_trig; +- iio_trigger_get(indio_dev->trig); + ret = iio_trigger_register(data->drdy_trig); + if (ret) + goto err_poweroff; ++ ++ indio_dev->trig = iio_trigger_get(data->drdy_trig); + } + + ret = iio_triggered_buffer_setup(indio_dev, NULL, diff --git a/queue-5.4/iio-gyro-mpu3050-fix-the-error-handling-in-mpu3050_power_up.patch b/queue-5.4/iio-gyro-mpu3050-fix-the-error-handling-in-mpu3050_power_up.patch new file mode 100644 index 00000000000..c9944d36ec1 --- /dev/null +++ b/queue-5.4/iio-gyro-mpu3050-fix-the-error-handling-in-mpu3050_power_up.patch @@ -0,0 +1,31 @@ +From b2f5ad97645e1deb5ca9bcb7090084b92cae35d2 Mon Sep 17 00:00:00 2001 +From: Zheyu Ma +Date: Tue, 10 May 2022 17:24:31 +0800 +Subject: iio: gyro: mpu3050: Fix the error handling in mpu3050_power_up() + +From: Zheyu Ma + +commit b2f5ad97645e1deb5ca9bcb7090084b92cae35d2 upstream. + +The driver should disable regulators when fails at regmap_update_bits(). + +Signed-off-by: Zheyu Ma +Reviewed-by: Linus Walleij +Cc: +Link: https://lore.kernel.org/r/20220510092431.1711284-1-zheyuma97@gmail.com +Signed-off-by: Jonathan Cameron +Signed-off-by: Greg Kroah-Hartman +--- + drivers/iio/gyro/mpu3050-core.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/iio/gyro/mpu3050-core.c ++++ b/drivers/iio/gyro/mpu3050-core.c +@@ -874,6 +874,7 @@ static int mpu3050_power_up(struct mpu30 + ret = regmap_update_bits(mpu3050->map, MPU3050_PWR_MGM, + MPU3050_PWR_MGM_SLEEP, 0); + if (ret) { ++ regulator_bulk_disable(ARRAY_SIZE(mpu3050->regs), mpu3050->regs); + dev_err(mpu3050->dev, "error setting power mode\n"); + return ret; + } diff --git a/queue-5.4/iio-trigger-sysfs-fix-use-after-free-on-remove.patch b/queue-5.4/iio-trigger-sysfs-fix-use-after-free-on-remove.patch new file mode 100644 index 00000000000..491c2cd62b6 --- /dev/null +++ b/queue-5.4/iio-trigger-sysfs-fix-use-after-free-on-remove.patch @@ -0,0 +1,69 @@ +From 78601726d4a59a291acc5a52da1d3a0a6831e4e8 Mon Sep 17 00:00:00 2001 +From: Vincent Whitchurch +Date: Thu, 19 May 2022 11:19:25 +0200 +Subject: iio: trigger: sysfs: fix use-after-free on remove + +From: Vincent Whitchurch + +commit 78601726d4a59a291acc5a52da1d3a0a6831e4e8 upstream. + +Ensure that the irq_work has completed before the trigger is freed. + + ================================================================== + BUG: KASAN: use-after-free in irq_work_run_list + Read of size 8 at addr 0000000064702248 by task python3/25 + + Call Trace: + irq_work_run_list + irq_work_tick + update_process_times + tick_sched_handle + tick_sched_timer + __hrtimer_run_queues + hrtimer_interrupt + + Allocated by task 25: + kmem_cache_alloc_trace + iio_sysfs_trig_add + dev_attr_store + sysfs_kf_write + kernfs_fop_write_iter + new_sync_write + vfs_write + ksys_write + sys_write + + Freed by task 25: + kfree + iio_sysfs_trig_remove + dev_attr_store + sysfs_kf_write + kernfs_fop_write_iter + new_sync_write + vfs_write + ksys_write + sys_write + + ================================================================== + +Fixes: f38bc926d022 ("staging:iio:sysfs-trigger: Use irq_work to properly active trigger") +Signed-off-by: Vincent Whitchurch +Reviewed-by: Lars-Peter Clausen +Link: https://lore.kernel.org/r/20220519091925.1053897-1-vincent.whitchurch@axis.com +Cc: +Signed-off-by: Jonathan Cameron +Signed-off-by: Greg Kroah-Hartman +--- + drivers/iio/trigger/iio-trig-sysfs.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/iio/trigger/iio-trig-sysfs.c ++++ b/drivers/iio/trigger/iio-trig-sysfs.c +@@ -196,6 +196,7 @@ static int iio_sysfs_trigger_remove(int + } + + iio_trigger_unregister(t->trig); ++ irq_work_sync(&t->work); + iio_trigger_free(t->trig); + + list_del(&t->l); diff --git a/queue-5.4/series b/queue-5.4/series index a3cd19e38e5..bea24005f4a 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -35,3 +35,10 @@ s390-cpumf-handle-events-cycles-and-instructions-ide.patch iio-adc-vf610-fix-conversion-mode-sysfs-node-name.patch xhci-turn-off-port-power-in-shutdown.patch usb-chipidea-udc-check-request-status-before-setting-device-address.patch +iio-chemical-ccs811-rearrange-iio-trigger-get-and-register.patch +iio-accel-bma180-rearrange-iio-trigger-get-and-register.patch +iio-accel-mxc4005-rearrange-iio-trigger-get-and-register.patch +iio-accel-mma8452-ignore-the-return-value-of-reset-operation.patch +iio-gyro-mpu3050-fix-the-error-handling-in-mpu3050_power_up.patch +iio-trigger-sysfs-fix-use-after-free-on-remove.patch +iio-adc-stm32-fix-maximum-clock-rate-for-stm32mp15x.patch