4.19-stable patches

added patches:
	drm-msm-dsi-fix-memory-corruption-with-too-many-bridges.patch
	drm-msm-hdmi-fix-memory-corruption-with-too-many-bridges.patch

diff --git a/queue-4.19/drm-msm-dsi-fix-memory-corruption-with-too-many-bridges.patch b/queue-4.19/drm-msm-dsi-fix-memory-corruption-with-too-many-bridges.patch
new file mode 100644 (file)
index 0000000..ebbca31
--- /dev/null
+++ b/queue-4.19/drm-msm-dsi-fix-memory-corruption-with-too-many-bridges.patch
@@ -0,0 +1,42 @@
+From 2e786eb2f9cebb07e317226b60054df510b60c65 Mon Sep 17 00:00:00 2001
+From: Johan Hovold <johan+linaro@kernel.org>
+Date: Tue, 13 Sep 2022 10:53:13 +0200
+Subject: drm/msm/dsi: fix memory corruption with too many bridges
+
+From: Johan Hovold <johan+linaro@kernel.org>
+
+commit 2e786eb2f9cebb07e317226b60054df510b60c65 upstream.
+
+Add the missing sanity check on the bridge counter to avoid corrupting
+data beyond the fixed-sized bridge array in case there are ever more
+than eight bridges.
+
+Fixes: a689554ba6ed ("drm/msm: Initial add DSI connector support")
+Cc: stable@vger.kernel.org     # 4.1
+Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
+Tested-by: Kuogee Hsieh <quic_khsieh@quicinc.com>
+Reviewed-by: Kuogee Hsieh <quic_khsieh@quicinc.com>
+Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Patchwork: https://patchwork.freedesktop.org/patch/502668/
+Link: https://lore.kernel.org/r/20220913085320.8577-4-johan+linaro@kernel.org
+Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/msm/dsi/dsi.c |    6 ++++++
+ 1 file changed, 6 insertions(+)
+
+--- a/drivers/gpu/drm/msm/dsi/dsi.c
++++ b/drivers/gpu/drm/msm/dsi/dsi.c
+@@ -200,6 +200,12 @@ int msm_dsi_modeset_init(struct msm_dsi
+               return -EINVAL;
+ 
+       priv = dev->dev_private;
++
++      if (priv->num_bridges == ARRAY_SIZE(priv->bridges)) {
++              DRM_DEV_ERROR(dev->dev, "too many bridges\n");
++              return -ENOSPC;
++      }
++
+       msm_dsi->dev = dev;
+ 
+       ret = msm_dsi_host_modeset_init(msm_dsi->host, dev);

diff --git a/queue-4.19/drm-msm-hdmi-fix-memory-corruption-with-too-many-bridges.patch b/queue-4.19/drm-msm-hdmi-fix-memory-corruption-with-too-many-bridges.patch
new file mode 100644 (file)
index 0000000..79397cf
--- /dev/null
+++ b/queue-4.19/drm-msm-hdmi-fix-memory-corruption-with-too-many-bridges.patch
@@ -0,0 +1,41 @@
+From 4c1294da6aed1f16d47a417dcfe6602833c3c95c Mon Sep 17 00:00:00 2001
+From: Johan Hovold <johan+linaro@kernel.org>
+Date: Tue, 13 Sep 2022 10:53:14 +0200
+Subject: drm/msm/hdmi: fix memory corruption with too many bridges
+
+From: Johan Hovold <johan+linaro@kernel.org>
+
+commit 4c1294da6aed1f16d47a417dcfe6602833c3c95c upstream.
+
+Add the missing sanity check on the bridge counter to avoid corrupting
+data beyond the fixed-sized bridge array in case there are ever more
+than eight bridges.
+
+Fixes: a3376e3ec81c ("drm/msm: convert to drm_bridge")
+Cc: stable@vger.kernel.org     # 3.12
+Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
+Tested-by: Kuogee Hsieh <quic_khsieh@quicinc.com>
+Reviewed-by: Kuogee Hsieh <quic_khsieh@quicinc.com>
+Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
+Patchwork: https://patchwork.freedesktop.org/patch/502670/
+Link: https://lore.kernel.org/r/20220913085320.8577-5-johan+linaro@kernel.org
+Signed-off-by: Abhinav Kumar <quic_abhinavk@quicinc.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/gpu/drm/msm/hdmi/hdmi.c |    5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/drivers/gpu/drm/msm/hdmi/hdmi.c
++++ b/drivers/gpu/drm/msm/hdmi/hdmi.c
+@@ -299,6 +299,11 @@ int msm_hdmi_modeset_init(struct hdmi *h
+       struct platform_device *pdev = hdmi->pdev;
+       int ret;
+ 
++      if (priv->num_bridges == ARRAY_SIZE(priv->bridges)) {
++              DRM_DEV_ERROR(dev->dev, "too many bridges\n");
++              return -ENOSPC;
++      }
++
+       hdmi->dev = dev;
+       hdmi->encoder = encoder;
+ 

diff --git a/queue-4.19/series b/queue-4.19/series
index cd2dc5d1fe38581f969490fafd289377fb62cef5..fe39802414e5ffe897d4a07431acbc730e77450b 100644 (file)
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -36,3 +36,5 @@ tools-iio-iio_utils-fix-digit-calculation.patch
 iio-light-tsl2583-fix-module-unloading.patch
 fbdev-smscufx-fix-several-use-after-free-bugs.patch
 mac802154-fix-lqi-recording.patch
+drm-msm-dsi-fix-memory-corruption-with-too-many-bridges.patch
+drm-msm-hdmi-fix-memory-corruption-with-too-many-bridges.patch