]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.19-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Oct 2024 07:22:00 +0000 (09:22 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 21 Oct 2024 07:22:00 +0000 (09:22 +0200)
added patches:
drm-vmwgfx-handle-surface-check-failure-correctly.patch
iio-adc-ti-ads8688-add-missing-select-iio_-triggered_-buffer-in-kconfig.patch
iio-dac-stm32-dac-core-add-missing-select-regmap_mmio-in-kconfig.patch
iio-hid-sensors-fix-an-error-handling-path-in-_hid_sensor_set_report_latency.patch
iio-light-opt3001-add-missing-full-scale-range-value.patch

queue-4.19/drm-vmwgfx-handle-surface-check-failure-correctly.patch [new file with mode: 0644]
queue-4.19/iio-adc-ti-ads8688-add-missing-select-iio_-triggered_-buffer-in-kconfig.patch [new file with mode: 0644]
queue-4.19/iio-dac-stm32-dac-core-add-missing-select-regmap_mmio-in-kconfig.patch [new file with mode: 0644]
queue-4.19/iio-hid-sensors-fix-an-error-handling-path-in-_hid_sensor_set_report_latency.patch [new file with mode: 0644]
queue-4.19/iio-light-opt3001-add-missing-full-scale-range-value.patch [new file with mode: 0644]
queue-4.19/series

diff --git a/queue-4.19/drm-vmwgfx-handle-surface-check-failure-correctly.patch b/queue-4.19/drm-vmwgfx-handle-surface-check-failure-correctly.patch
new file mode 100644 (file)
index 0000000..c26918a
--- /dev/null
@@ -0,0 +1,37 @@
+From 26498b8d54373d31a621d7dec95c4bd842563b3b Mon Sep 17 00:00:00 2001
+From: Nikolay Kuratov <kniv@yandex-team.ru>
+Date: Wed, 2 Oct 2024 15:24:29 +0300
+Subject: drm/vmwgfx: Handle surface check failure correctly
+
+From: Nikolay Kuratov <kniv@yandex-team.ru>
+
+commit 26498b8d54373d31a621d7dec95c4bd842563b3b upstream.
+
+Currently if condition (!bo and !vmw_kms_srf_ok()) was met
+we go to err_out with ret == 0.
+err_out dereferences vfb if ret == 0, but in our case vfb is still NULL.
+
+Fix this by assigning sensible error to ret.
+
+Found by Linux Verification Center (linuxtesting.org) with SVACE
+
+Signed-off-by: Nikolay Kuratov <kniv@yandex-team.ru>
+Cc: stable@vger.kernel.org
+Fixes: 810b3e1683d0 ("drm/vmwgfx: Support topology greater than texture size")
+Signed-off-by: Zack Rusin <zack.rusin@broadcom.com>
+Link: https://patchwork.freedesktop.org/patch/msgid/20241002122429.1981822-1-kniv@yandex-team.ru
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/vmwgfx/vmwgfx_kms.c |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
++++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+@@ -1468,6 +1468,7 @@ static struct drm_framebuffer *vmw_kms_f
+               DRM_ERROR("Surface size cannot exceed %dx%d",
+                       dev_priv->texture_max_width,
+                       dev_priv->texture_max_height);
++              ret = -EINVAL;
+               goto err_out;
+       }
diff --git a/queue-4.19/iio-adc-ti-ads8688-add-missing-select-iio_-triggered_-buffer-in-kconfig.patch b/queue-4.19/iio-adc-ti-ads8688-add-missing-select-iio_-triggered_-buffer-in-kconfig.patch
new file mode 100644 (file)
index 0000000..382babf
--- /dev/null
@@ -0,0 +1,36 @@
+From 4c4834fd8696a949d1b1f1c2c5b96e1ad2083b02 Mon Sep 17 00:00:00 2001
+From: Javier Carrasco <javier.carrasco.cruz@gmail.com>
+Date: Thu, 3 Oct 2024 23:04:50 +0200
+Subject: iio: adc: ti-ads8688: add missing select IIO_(TRIGGERED_)BUFFER in Kconfig
+
+From: Javier Carrasco <javier.carrasco.cruz@gmail.com>
+
+commit 4c4834fd8696a949d1b1f1c2c5b96e1ad2083b02 upstream.
+
+This driver makes use of triggered buffers, but does not select the
+required modules.
+
+Fixes: 2a86487786b5 ("iio: adc: ti-ads8688: add trigger and buffer support")
+Add the missing 'select IIO_BUFFER' and 'select IIO_TRIGGERED_BUFFER'.
+
+Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
+Reviewed-by: Sean Nyekjaer <sean@geanix.com>
+Link: https://patch.msgid.link/20241003-iio-select-v1-4-67c0385197cd@gmail.com
+Cc: <Stable@vger.kernel.org>
+Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/iio/adc/Kconfig |    2 ++
+ 1 file changed, 2 insertions(+)
+
+--- a/drivers/iio/adc/Kconfig
++++ b/drivers/iio/adc/Kconfig
+@@ -852,6 +852,8 @@ config TI_ADS7950
+ config TI_ADS8688
+       tristate "Texas Instruments ADS8688"
+       depends on SPI && OF
++      select IIO_BUFFER
++      select IIO_TRIGGERED_BUFFER
+       help
+         If you say yes here you get support for Texas Instruments ADS8684 and
+         and ADS8688 ADC chips
diff --git a/queue-4.19/iio-dac-stm32-dac-core-add-missing-select-regmap_mmio-in-kconfig.patch b/queue-4.19/iio-dac-stm32-dac-core-add-missing-select-regmap_mmio-in-kconfig.patch
new file mode 100644 (file)
index 0000000..fbd9dad
--- /dev/null
@@ -0,0 +1,33 @@
+From 27b6aa68a68105086aef9f0cb541cd688e5edea8 Mon Sep 17 00:00:00 2001
+From: Javier Carrasco <javier.carrasco.cruz@gmail.com>
+Date: Thu, 3 Oct 2024 18:49:40 +0200
+Subject: iio: dac: stm32-dac-core: add missing select REGMAP_MMIO in Kconfig
+
+From: Javier Carrasco <javier.carrasco.cruz@gmail.com>
+
+commit 27b6aa68a68105086aef9f0cb541cd688e5edea8 upstream.
+
+This driver makes use of regmap_mmio, but does not select the required
+module.
+Add the missing 'select REGMAP_MMIO'.
+
+Fixes: 4d4b30526eb8 ("iio: dac: add support for stm32 DAC")
+Signed-off-by: Javier Carrasco <javier.carrasco.cruz@gmail.com>
+Link: https://patch.msgid.link/20241003-ad2s1210-select-v1-8-4019453f8c33@gmail.com
+Cc: <Stable@vger.kernel.org>
+Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/iio/dac/Kconfig |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/iio/dac/Kconfig
++++ b/drivers/iio/dac/Kconfig
+@@ -335,6 +335,7 @@ config STM32_DAC
+ config STM32_DAC_CORE
+       tristate
++      select REGMAP_MMIO
+ config TI_DAC082S085
+       tristate "Texas Instruments 8/10/12-bit 2/4-channel DAC driver"
diff --git a/queue-4.19/iio-hid-sensors-fix-an-error-handling-path-in-_hid_sensor_set_report_latency.patch b/queue-4.19/iio-hid-sensors-fix-an-error-handling-path-in-_hid_sensor_set_report_latency.patch
new file mode 100644 (file)
index 0000000..6228426
--- /dev/null
@@ -0,0 +1,34 @@
+From 3a29b84cf7fbf912a6ab1b9c886746f02b74ea25 Mon Sep 17 00:00:00 2001
+From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
+Date: Thu, 3 Oct 2024 20:41:12 +0200
+Subject: iio: hid-sensors: Fix an error handling path in _hid_sensor_set_report_latency()
+
+From: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
+
+commit 3a29b84cf7fbf912a6ab1b9c886746f02b74ea25 upstream.
+
+If hid_sensor_set_report_latency() fails, the error code should be returned
+instead of a value likely to be interpreted as 'success'.
+
+Fixes: 138bc7969c24 ("iio: hid-sensor-hub: Implement batch mode")
+Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
+Acked-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
+Link: https://patch.msgid.link/c50640665f091a04086e5092cf50f73f2055107a.1727980825.git.christophe.jaillet@wanadoo.fr
+Cc: <Stable@vger.kernel.org>
+Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/iio/common/hid-sensors/hid-sensor-trigger.c |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
++++ b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
+@@ -46,7 +46,7 @@ static ssize_t _hid_sensor_set_report_la
+       latency = integer * 1000 + fract / 1000;
+       ret = hid_sensor_set_report_latency(attrb, latency);
+       if (ret < 0)
+-              return len;
++              return ret;
+       attrb->latency_ms = hid_sensor_get_report_latency(attrb);
diff --git a/queue-4.19/iio-light-opt3001-add-missing-full-scale-range-value.patch b/queue-4.19/iio-light-opt3001-add-missing-full-scale-range-value.patch
new file mode 100644 (file)
index 0000000..f2fe92b
--- /dev/null
@@ -0,0 +1,41 @@
+From 530688e39c644543b71bdd9cb45fdfb458a28eaa Mon Sep 17 00:00:00 2001
+From: Emil Gedenryd <emil.gedenryd@axis.com>
+Date: Fri, 13 Sep 2024 11:57:02 +0200
+Subject: iio: light: opt3001: add missing full-scale range value
+
+From: Emil Gedenryd <emil.gedenryd@axis.com>
+
+commit 530688e39c644543b71bdd9cb45fdfb458a28eaa upstream.
+
+The opt3001 driver uses predetermined full-scale range values to
+determine what exponent to use for event trigger threshold values.
+The problem is that one of the values specified in the datasheet is
+missing from the implementation. This causes larger values to be
+scaled down to an incorrect exponent, effectively reducing the
+maximum settable threshold value by a factor of 2.
+
+Add missing full-scale range array value.
+
+Fixes: 94a9b7b1809f ("iio: light: add support for TI's opt3001 light sensor")
+Signed-off-by: Emil Gedenryd <emil.gedenryd@axis.com>
+Cc: <Stable@vger.kernel.org>
+Link: https://patch.msgid.link/20240913-add_opt3002-v2-1-69e04f840360@axis.com
+Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/iio/light/opt3001.c |    4 ++++
+ 1 file changed, 4 insertions(+)
+
+--- a/drivers/iio/light/opt3001.c
++++ b/drivers/iio/light/opt3001.c
+@@ -146,6 +146,10 @@ static const struct opt3001_scale opt300
+               .val2 = 400000,
+       },
+       {
++              .val = 41932,
++              .val2 = 800000,
++      },
++      {
+               .val = 83865,
+               .val2 = 600000,
+       },
index e4237e7a505050d0ad621b44789ad2a28e18b81d..26182ef87bdfd9b48102b98af2302281e30b4b07 100644 (file)
@@ -275,3 +275,8 @@ net-dsa-mv88e6xxx-fix-out-of-bound-access.patch
 s390-sclp_vt220-convert-newlines-to-crlf-instead-of-lfcr.patch
 kvm-s390-change-virtual-to-physical-address-access-in-diag-0x258-handler.patch
 x86-cpufeatures-define-x86_feature_amd_ibpb_ret.patch
+drm-vmwgfx-handle-surface-check-failure-correctly.patch
+iio-dac-stm32-dac-core-add-missing-select-regmap_mmio-in-kconfig.patch
+iio-adc-ti-ads8688-add-missing-select-iio_-triggered_-buffer-in-kconfig.patch
+iio-hid-sensors-fix-an-error-handling-path-in-_hid_sensor_set_report_latency.patch
+iio-light-opt3001-add-missing-full-scale-range-value.patch