Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f649ed0e authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

drm/msm/dsi: fix memory corruption with too many bridges 



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: a689554b ("drm/msm: Initial add DSI connector support")
Cc: stable@vger.kernel.org	# 4.1
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Tested-by: default avatarKuogee Hsieh <quic_khsieh@quicinc.com>
Reviewed-by: default avatarKuogee Hsieh <quic_khsieh@quicinc.com>
Reviewed-by: default avatarDmitry 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: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e7348308

drivers/gpu/drm/msm/dsi/dsi.c

+6 −0
Original line number Diff line number Diff line
@@ -203,6 +203,12 @@ int msm_dsi_modeset_init(struct msm_dsi *msm_dsi, 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;

	}



	msm_dsi->dev = dev;



	ret = msm_dsi_host_modeset_init(msm_dsi->host, dev);