This is a note to let you know that I've just added the patch titled
drm/msm/dp: fix memory corruption with too many bridges
to the 6.0-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
drm-msm-dp-fix-memory-corruption-with-too-many-bridges.patch
and it can be found in the queue-6.0 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 74466e46e7543c7f74f1502181e9ba93f7521374 Mon Sep 17 00:00:00 2001
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
Date: Tue, 13 Sep 2022 10:53:12 +0200
Subject: drm/msm/dp: fix memory corruption with too many bridges
From: Johan Hovold <johan+linaro@xxxxxxxxxx>
commit 74466e46e7543c7f74f1502181e9ba93f7521374 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: 8a3b4c17f863 ("drm/msm/dp: employ bridge mechanism for display enable and disable")
Cc: stable@xxxxxxxxxxxxxxx # 5.17
Signed-off-by: Johan Hovold <johan+linaro@xxxxxxxxxx>
Tested-by: Kuogee Hsieh <quic_khsieh@xxxxxxxxxxx>
Reviewed-by: Kuogee Hsieh <quic_khsieh@xxxxxxxxxxx>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxx>
Patchwork: https://patchwork.freedesktop.org/patch/502664/
Link: https://lore.kernel.org/r/20220913085320.8577-3-johan+linaro@xxxxxxxxxx
Signed-off-by: Abhinav Kumar <quic_abhinavk@xxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/gpu/drm/msm/dp/dp_display.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/gpu/drm/msm/dp/dp_display.c b/drivers/gpu/drm/msm/dp/dp_display.c
index bfd0aeff3f0d..be9ed891dc3f 100644
--- a/drivers/gpu/drm/msm/dp/dp_display.c
+++ b/drivers/gpu/drm/msm/dp/dp_display.c
@@ -1597,6 +1597,12 @@ int msm_dp_modeset_init(struct msm_dp *dp_display, struct drm_device *dev,
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;
+ }
+
dp_display->drm_dev = dev;
dp_priv = container_of(dp_display, struct dp_display_private, dp_display);
--
2.38.1
Patches currently in stable-queue which might be from johan+linaro@xxxxxxxxxx are
queue-6.0/drm-msm-dp-fix-memory-corruption-with-too-many-bridges.patch
queue-6.0/drm-msm-dp-fix-aux-bus-ep-lifetime.patch
queue-6.0/drm-msm-dsi-fix-memory-corruption-with-too-many-bridges.patch
queue-6.0/drm-msm-fix-use-after-free-on-probe-deferral.patch
queue-6.0/drm-msm-hdmi-fix-memory-corruption-with-too-many-bridges.patch
queue-6.0/drm-msm-dp-fix-bridge-lifetime.patch
queue-6.0/drm-msm-dp-fix-irq-lifetime.patch
queue-6.0/drm-msm-hdmi-fix-irq-lifetime.patch
