From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: Paul Cercueil <paul@crapouillou.net> Cc: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Jernej Skrabec <jernej.skrabec@siol.net>, Neil Armstrong <narmstrong@baylibre.com>, Jonas Karlman <jonas@kwiboo.se>, linux-mips@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Andrzej Hajda <a.hajda@samsung.com>, od@zcrc.me, stable@vger.kernel.org, Sam Ravnborg <sam@ravnborg.org> Subject: Re: [PATCH v3 1/4] drm: bridge/panel: Cleanup connector on bridge detach Date: Wed, 24 Mar 2021 04:16:43 +0200 [thread overview] Message-ID: <YFqhC6e/Gb2JrKyC@pendragon.ideasonboard.com> (raw) In-Reply-To: <20210124085552.29146-2-paul@crapouillou.net> Hi Paul, Thank you for the patch. On Sun, Jan 24, 2021 at 08:55:49AM +0000, Paul Cercueil wrote: > If we don't call drm_connector_cleanup() manually in > panel_bridge_detach(), the connector will be cleaned up with the other > DRM objects in the call to drm_mode_config_cleanup(). However, since our > drm_connector is devm-allocated, by the time drm_mode_config_cleanup() > will be called, our connector will be long gone. Therefore, the > connector must be cleaned up when the bridge is detached to avoid > use-after-free conditions. > > v2: Cleanup connector only if it was created > > v3: Add FIXME > > Fixes: 13dfc0540a57 ("drm/bridge: Refactor out the panel wrapper from the lvds-encoder bridge.") > Cc: <stable@vger.kernel.org> # 4.12+ > Cc: Andrzej Hajda <a.hajda@samsung.com> > Cc: Neil Armstrong <narmstrong@baylibre.com> > Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com> > Cc: Jonas Karlman <jonas@kwiboo.se> > Cc: Jernej Skrabec <jernej.skrabec@siol.net> > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > --- > drivers/gpu/drm/bridge/panel.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c > index 0ddc37551194..5959e8183cd0 100644 > --- a/drivers/gpu/drm/bridge/panel.c > +++ b/drivers/gpu/drm/bridge/panel.c > @@ -87,6 +87,18 @@ static int panel_bridge_attach(struct drm_bridge *bridge, > > static void panel_bridge_detach(struct drm_bridge *bridge) > { > + struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge); > + struct drm_connector *connector = &panel_bridge->connector; > + > + /* > + * Cleanup the connector if we know it was initialized. > + * > + * FIXME: This wouldn't be needed if the panel_bridge structure was > + * allocated with drmm_kzalloc(). This might be tricky since the > + * drm_device pointer can only be retrieved when the bridge is attached. > + */ > + if (!!panel_bridge->connector.dev) How about simply if (connector->dev) ? With this change, Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > + drm_connector_cleanup(connector); > } > > static void panel_bridge_pre_enable(struct drm_bridge *bridge) -- Regards, Laurent Pinchart
WARNING: multiple messages have this Message-ID (diff)
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com> To: Paul Cercueil <paul@crapouillou.net> Cc: Jernej Skrabec <jernej.skrabec@siol.net>, Jonas Karlman <jonas@kwiboo.se>, David Airlie <airlied@linux.ie>, Neil Armstrong <narmstrong@baylibre.com>, linux-mips@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Andrzej Hajda <a.hajda@samsung.com>, od@zcrc.me, stable@vger.kernel.org, Sam Ravnborg <sam@ravnborg.org> Subject: Re: [PATCH v3 1/4] drm: bridge/panel: Cleanup connector on bridge detach Date: Wed, 24 Mar 2021 04:16:43 +0200 [thread overview] Message-ID: <YFqhC6e/Gb2JrKyC@pendragon.ideasonboard.com> (raw) In-Reply-To: <20210124085552.29146-2-paul@crapouillou.net> Hi Paul, Thank you for the patch. On Sun, Jan 24, 2021 at 08:55:49AM +0000, Paul Cercueil wrote: > If we don't call drm_connector_cleanup() manually in > panel_bridge_detach(), the connector will be cleaned up with the other > DRM objects in the call to drm_mode_config_cleanup(). However, since our > drm_connector is devm-allocated, by the time drm_mode_config_cleanup() > will be called, our connector will be long gone. Therefore, the > connector must be cleaned up when the bridge is detached to avoid > use-after-free conditions. > > v2: Cleanup connector only if it was created > > v3: Add FIXME > > Fixes: 13dfc0540a57 ("drm/bridge: Refactor out the panel wrapper from the lvds-encoder bridge.") > Cc: <stable@vger.kernel.org> # 4.12+ > Cc: Andrzej Hajda <a.hajda@samsung.com> > Cc: Neil Armstrong <narmstrong@baylibre.com> > Cc: Laurent Pinchart <Laurent.pinchart@ideasonboard.com> > Cc: Jonas Karlman <jonas@kwiboo.se> > Cc: Jernej Skrabec <jernej.skrabec@siol.net> > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > --- > drivers/gpu/drm/bridge/panel.c | 12 ++++++++++++ > 1 file changed, 12 insertions(+) > > diff --git a/drivers/gpu/drm/bridge/panel.c b/drivers/gpu/drm/bridge/panel.c > index 0ddc37551194..5959e8183cd0 100644 > --- a/drivers/gpu/drm/bridge/panel.c > +++ b/drivers/gpu/drm/bridge/panel.c > @@ -87,6 +87,18 @@ static int panel_bridge_attach(struct drm_bridge *bridge, > > static void panel_bridge_detach(struct drm_bridge *bridge) > { > + struct panel_bridge *panel_bridge = drm_bridge_to_panel_bridge(bridge); > + struct drm_connector *connector = &panel_bridge->connector; > + > + /* > + * Cleanup the connector if we know it was initialized. > + * > + * FIXME: This wouldn't be needed if the panel_bridge structure was > + * allocated with drmm_kzalloc(). This might be tricky since the > + * drm_device pointer can only be retrieved when the bridge is attached. > + */ > + if (!!panel_bridge->connector.dev) How about simply if (connector->dev) ? With this change, Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > + drm_connector_cleanup(connector); > } > > static void panel_bridge_pre_enable(struct drm_bridge *bridge) -- Regards, Laurent Pinchart _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2021-03-24 2:18 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-24 8:55 [PATCH v3 0/4] Fixes to bridge/panel and ingenic-drm Paul Cercueil 2021-01-24 8:55 ` Paul Cercueil 2021-01-24 8:55 ` [PATCH v3 1/4] drm: bridge/panel: Cleanup connector on bridge detach Paul Cercueil 2021-01-24 8:55 ` Paul Cercueil 2021-03-24 2:16 ` Laurent Pinchart [this message] 2021-03-24 2:16 ` Laurent Pinchart 2021-01-24 8:55 ` [PATCH v3 2/4] drm/simple_kms_helper: Add macro drmm_plain_simple_encoder_alloc() Paul Cercueil 2021-01-24 8:55 ` Paul Cercueil 2021-03-24 2:24 ` Laurent Pinchart 2021-03-24 2:24 ` Laurent Pinchart 2021-01-24 8:55 ` [PATCH v3 3/4] drm/ingenic: Register devm action to cleanup encoders Paul Cercueil 2021-01-24 8:55 ` Paul Cercueil 2021-03-24 2:27 ` Laurent Pinchart 2021-03-24 2:27 ` Laurent Pinchart 2021-01-24 8:55 ` [PATCH v3 4/4] drm/ingenic: Fix non-OSD mode Paul Cercueil 2021-01-24 8:55 ` Paul Cercueil 2021-01-24 9:30 ` H. Nikolaus Schaller 2021-01-24 9:30 ` H. Nikolaus Schaller 2021-01-24 9:43 ` Paul Cercueil 2021-01-24 9:43 ` Paul Cercueil 2021-01-24 9:47 ` H. Nikolaus Schaller 2021-01-24 9:47 ` H. Nikolaus Schaller 2021-01-25 18:56 ` H. Nikolaus Schaller 2021-01-25 18:56 ` H. Nikolaus Schaller 2021-03-24 2:31 ` Laurent Pinchart 2021-03-24 2:31 ` Laurent Pinchart 2021-02-24 13:44 ` [PATCH v3 0/4] Fixes to bridge/panel and ingenic-drm Paul Cercueil 2021-02-24 13:44 ` Paul Cercueil 2021-03-23 16:03 ` Paul Cercueil 2021-03-23 16:03 ` Paul Cercueil 2021-03-24 2:32 ` Laurent Pinchart 2021-03-24 2:32 ` Laurent Pinchart
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=YFqhC6e/Gb2JrKyC@pendragon.ideasonboard.com \ --to=laurent.pinchart@ideasonboard.com \ --cc=a.hajda@samsung.com \ --cc=airlied@linux.ie \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=jernej.skrabec@siol.net \ --cc=jonas@kwiboo.se \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mips@vger.kernel.org \ --cc=narmstrong@baylibre.com \ --cc=od@zcrc.me \ --cc=paul@crapouillou.net \ --cc=sam@ravnborg.org \ --cc=stable@vger.kernel.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.