From: Johan Hovold <johan+linaro@kernel.org> To: Douglas Anderson <dianders@chromium.org>, Dmitry Baryshkov <dmitry.baryshkov@linaro.org>, Rob Clark <robdclark@gmail.com>, Abhinav Kumar <quic_abhinavk@quicinc.com> Cc: Andrzej Hajda <andrzej.hajda@intel.com>, Neil Armstrong <neil.armstrong@linaro.org>, Robert Foss <robert.foss@linaro.org>, Laurent Pinchart <Laurent.pinchart@ideasonboard.com>, Jonas Karlman <jonas@kwiboo.se>, Jernej Skrabec <jernej.skrabec@gmail.com>, Daniel Vetter <daniel@ffwll.ch>, Sean Paul <sean@poorly.run>, Stephen Boyd <swboyd@chromium.org>, Bjorn Andersson <andersson@kernel.org>, Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>, Kuogee Hsieh <quic_khsieh@quicinc.com>, Steev Klimaszewski <steev@kali.org>, dri-devel@lists.freedesktop.org, linux-arm-msm@vger.kernel.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Johan Hovold <johan+linaro@kernel.org>, stable@vger.kernel.org Subject: [PATCH v2 03/10] drm/msm/dsi: fix memory corruption with too many bridges Date: Tue, 13 Sep 2022 10:53:13 +0200 [thread overview] Message-ID: <20220913085320.8577-4-johan+linaro@kernel.org> (raw) In-Reply-To: <20220913085320.8577-1-johan+linaro@kernel.org> 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> --- drivers/gpu/drm/msm/dsi/dsi.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 39bbabb5daf6..8a95c744972a 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -218,6 +218,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); -- 2.35.1
WARNING: multiple messages have this Message-ID (diff)
From: Johan Hovold <johan+linaro@kernel.org> To: Douglas Anderson <dianders@chromium.org>, Dmitry Baryshkov <dmitry.baryshkov@linaro.org>, Rob Clark <robdclark@gmail.com>, Abhinav Kumar <quic_abhinavk@quicinc.com> Cc: dri-devel@lists.freedesktop.org, Neil Armstrong <neil.armstrong@linaro.org>, Jonas Karlman <jonas@kwiboo.se>, linux-arm-msm@vger.kernel.org, Bjorn Andersson <andersson@kernel.org>, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Jernej Skrabec <jernej.skrabec@gmail.com>, Stephen Boyd <swboyd@chromium.org>, Johan Hovold <johan+linaro@kernel.org>, Robert Foss <robert.foss@linaro.org>, Andrzej Hajda <andrzej.hajda@intel.com>, Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>, stable@vger.kernel.org, Kuogee Hsieh <quic_khsieh@quicinc.com>, Sean Paul <sean@poorly.run>, Steev Klimaszewski <steev@kali.org>, Laurent Pinchart <Laurent.pinchart@ideasonboard.com> Subject: [PATCH v2 03/10] drm/msm/dsi: fix memory corruption with too many bridges Date: Tue, 13 Sep 2022 10:53:13 +0200 [thread overview] Message-ID: <20220913085320.8577-4-johan+linaro@kernel.org> (raw) In-Reply-To: <20220913085320.8577-1-johan+linaro@kernel.org> 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> --- drivers/gpu/drm/msm/dsi/dsi.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c index 39bbabb5daf6..8a95c744972a 100644 --- a/drivers/gpu/drm/msm/dsi/dsi.c +++ b/drivers/gpu/drm/msm/dsi/dsi.c @@ -218,6 +218,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); -- 2.35.1
next prev parent reply other threads:[~2022-09-13 8:58 UTC|newest] Thread overview: 87+ messages / expand[flat|nested] mbox.gz Atom feed top 2022-09-13 8:53 [PATCH v2 00/10] drm/msm: probe deferral fixes Johan Hovold 2022-09-13 8:53 ` Johan Hovold 2022-09-13 8:53 ` [PATCH v2 01/10] drm/msm: fix use-after-free on probe deferral Johan Hovold 2022-09-13 8:53 ` Johan Hovold 2022-09-22 19:48 ` [Freedreno] " Kuogee Hsieh 2022-09-22 19:48 ` Kuogee Hsieh 2022-09-22 20:01 ` Kuogee Hsieh 2022-09-22 20:01 ` Kuogee Hsieh 2022-09-13 8:53 ` [PATCH v2 02/10] drm/msm/dp: fix memory corruption with too many bridges Johan Hovold 2022-09-13 8:53 ` Johan Hovold 2022-09-22 19:51 ` [Freedreno] " Kuogee Hsieh 2022-09-22 19:51 ` Kuogee Hsieh 2022-09-22 19:54 ` Dmitry Baryshkov 2022-09-22 19:54 ` Dmitry Baryshkov 2022-09-13 8:53 ` Johan Hovold [this message] 2022-09-13 8:53 ` [PATCH v2 03/10] drm/msm/dsi: " Johan Hovold 2022-09-22 19:51 ` Kuogee Hsieh 2022-09-22 19:51 ` Kuogee Hsieh 2022-09-22 19:54 ` Dmitry Baryshkov 2022-09-22 19:54 ` Dmitry Baryshkov 2022-09-13 8:53 ` [PATCH v2 04/10] drm/msm/hdmi: " Johan Hovold 2022-09-13 8:53 ` Johan Hovold 2022-09-22 19:52 ` [Freedreno] " Kuogee Hsieh 2022-09-22 19:52 ` Kuogee Hsieh 2022-09-22 19:54 ` Dmitry Baryshkov 2022-09-22 19:54 ` Dmitry Baryshkov 2022-09-13 8:53 ` [PATCH v2 05/10] drm/msm/dp: fix IRQ lifetime Johan Hovold 2022-09-13 8:53 ` Johan Hovold 2022-09-22 19:54 ` [Freedreno] " Kuogee Hsieh 2022-09-22 19:54 ` Kuogee Hsieh 2022-09-13 8:53 ` [PATCH v2 06/10] drm/msm/dp: fix aux-bus EP lifetime Johan Hovold 2022-09-13 8:53 ` Johan Hovold 2022-09-13 12:36 ` Doug Anderson 2022-09-13 12:36 ` Doug Anderson 2022-09-22 20:02 ` Kuogee Hsieh 2022-09-13 8:53 ` [PATCH v2 07/10] drm/msm/dp: fix bridge lifetime Johan Hovold 2022-09-13 8:53 ` Johan Hovold 2022-09-22 19:56 ` [Freedreno] " Kuogee Hsieh 2022-09-22 19:56 ` Kuogee Hsieh 2022-09-13 8:53 ` [PATCH v2 08/10] drm/msm/hdmi: fix IRQ lifetime Johan Hovold 2022-09-13 8:53 ` Johan Hovold 2022-09-22 19:55 ` Kuogee Hsieh 2022-09-22 19:55 ` Kuogee Hsieh 2022-09-23 6:17 ` Johan Hovold 2022-09-23 6:17 ` Johan Hovold 2022-09-13 8:53 ` [PATCH v2 09/10] drm/msm/dp: drop modeset sanity checks Johan Hovold 2022-09-13 8:53 ` Johan Hovold 2022-09-22 19:57 ` Kuogee Hsieh 2022-09-22 19:57 ` Kuogee Hsieh 2022-09-26 18:17 ` Abhinav Kumar 2022-09-26 18:17 ` Abhinav Kumar 2022-09-27 7:14 ` Johan Hovold 2022-09-27 7:14 ` Johan Hovold 2022-09-27 18:42 ` Abhinav Kumar 2022-09-27 18:42 ` Abhinav Kumar 2022-09-28 12:24 ` Johan Hovold 2022-09-28 12:24 ` Johan Hovold 2022-09-28 15:33 ` Abhinav Kumar 2022-09-28 15:33 ` Abhinav Kumar 2022-09-28 15:57 ` Johan Hovold 2022-09-28 15:57 ` Johan Hovold 2022-09-13 8:53 ` [PATCH v2 10/10] drm/msm/dsi: " Johan Hovold 2022-09-13 8:53 ` Johan Hovold 2022-09-22 19:58 ` [Freedreno] " Kuogee Hsieh 2022-09-22 19:58 ` Kuogee Hsieh 2022-09-26 18:21 ` Abhinav Kumar 2022-09-26 18:21 ` Abhinav Kumar 2022-09-27 7:16 ` Johan Hovold 2022-09-27 7:16 ` Johan Hovold 2022-09-27 18:44 ` Abhinav Kumar 2022-09-27 18:44 ` Abhinav Kumar 2022-09-13 20:23 ` [PATCH v2 00/10] drm/msm: probe deferral fixes Steev Klimaszewski 2022-09-13 20:23 ` Steev Klimaszewski 2022-09-14 6:01 ` Johan Hovold 2022-09-14 6:01 ` Johan Hovold 2022-09-16 16:43 ` Steev Klimaszewski 2022-09-16 16:43 ` Steev Klimaszewski 2022-09-20 9:06 ` Johan Hovold 2022-09-20 9:06 ` Johan Hovold 2022-10-21 6:27 ` Johan Hovold 2022-10-21 6:27 ` Johan Hovold 2022-10-21 16:05 ` Abhinav Kumar 2022-10-21 16:05 ` Abhinav Kumar 2022-10-24 11:33 ` Johan Hovold 2022-10-24 11:33 ` Johan Hovold 2022-10-24 15:01 ` Rob Clark 2022-10-24 15:01 ` Rob Clark
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220913085320.8577-4-johan+linaro@kernel.org \ --to=johan+linaro@kernel.org \ --cc=Laurent.pinchart@ideasonboard.com \ --cc=andersson@kernel.org \ --cc=andrzej.hajda@intel.com \ --cc=daniel@ffwll.ch \ --cc=dianders@chromium.org \ --cc=dmitry.baryshkov@linaro.org \ --cc=dri-devel@lists.freedesktop.org \ --cc=freedreno@lists.freedesktop.org \ --cc=jernej.skrabec@gmail.com \ --cc=jonas@kwiboo.se \ --cc=linux-arm-msm@vger.kernel.org \ --cc=linux-kernel@vger.kernel.org \ --cc=manivannan.sadhasivam@linaro.org \ --cc=neil.armstrong@linaro.org \ --cc=quic_abhinavk@quicinc.com \ --cc=quic_khsieh@quicinc.com \ --cc=robdclark@gmail.com \ --cc=robert.foss@linaro.org \ --cc=sean@poorly.run \ --cc=stable@vger.kernel.org \ --cc=steev@kali.org \ --cc=swboyd@chromium.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.