Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <20230324035909.1727356-1-treapking@chromium.org>
In-Reply-To: <20230324035909.1727356-1-treapking@chromium.org>
From:   Robert Foss <rfoss@kernel.org>
Date:   Fri, 24 Mar 2023 15:05:22 +0100
Message-ID: <CAN6tsi7M26ijWT0hVOAoSFE6fhy-0TS-c7+5LUJpo-NJAG21Mw@mail.gmail.com>
Subject: Re: [PATCH] drm/bridge: ps8640: Return NULL immediately when EDID
 read fail
To:     Pin-yen Lin <treapking@chromium.org>
Cc:     Douglas Anderson <dianders@chromium.org>,
        Andrzej Hajda <andrzej.hajda@intel.com>,
        Neil Armstrong <neil.armstrong@linaro.org>,
        Laurent Pinchart <Laurent.pinchart@ideasonboard.com>,
        Jonas Karlman <jonas@kwiboo.se>,
        Jernej Skrabec <jernej.skrabec@gmail.com>,
        David Airlie <airlied@gmail.com>,
        Daniel Vetter <daniel@ffwll.ch>,
        dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Fri, Mar 24, 2023 at 4:59=E2=80=AFAM Pin-yen Lin <treapking@chromium.org=
> wrote:
>
> drm_edid_read returns NULL on error, so feeding it directly into
> drm_edid_duplicate may lead to NULL pointer dereference. Add a check to
> guard this.
>
> Fixes: 6a17b4d1b52f ("drm/bridge: ps8640: Add a cache for EDID")
> Signed-off-by: Pin-yen Lin <treapking@chromium.org>
> ---
>
>  drivers/gpu/drm/bridge/parade-ps8640.c | 6 ++++++
>  1 file changed, 6 insertions(+)
>
> diff --git a/drivers/gpu/drm/bridge/parade-ps8640.c b/drivers/gpu/drm/bri=
dge/parade-ps8640.c
> index cddbfe91f75e..b823e55650b1 100644
> --- a/drivers/gpu/drm/bridge/parade-ps8640.c
> +++ b/drivers/gpu/drm/bridge/parade-ps8640.c
> @@ -543,6 +543,7 @@ static struct edid *ps8640_bridge_get_edid(struct drm=
_bridge *bridge,
>                                            struct drm_connector *connecto=
r)
>  {
>         struct ps8640 *ps_bridge =3D bridge_to_ps8640(bridge);
> +       struct device *dev =3D &ps_bridge->page[PAGE0_DP_CNTL]->dev;
>         bool poweroff =3D !ps_bridge->pre_enabled;
>
>         if (!ps_bridge->edid) {
> @@ -574,6 +575,11 @@ static struct edid *ps8640_bridge_get_edid(struct dr=
m_bridge *bridge,
>                                                              connector->s=
tate->state);
>         }
>
> +       if (!ps_bridge->edid) {
> +               dev_err(dev, "Failed to get EDID\n");
> +               return NULL;
> +       }
> +
>         return drm_edid_duplicate(ps_bridge->edid);
>  }
>
> --
> 2.40.0.348.gf938b09366-goog
>

Reviewed-by: Robert Foss <rfoss@kernel.org>