From: Paul Cercueil <paul@crapouillou.net> To: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch> Cc: Sam Ravnborg <sam@ravnborg.org>, Laurent Pinchart <Laurent.pinchart@ideasonboard.com>, od@zcrc.me, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, Paul Cercueil <paul@crapouillou.net>, stable@vger.kernel.org Subject: [PATCH v3 3/4] drm/ingenic: Register devm action to cleanup encoders Date: Sun, 24 Jan 2021 08:55:51 +0000 [thread overview] Message-ID: <20210124085552.29146-4-paul@crapouillou.net> (raw) In-Reply-To: <20210124085552.29146-1-paul@crapouillou.net> Since the encoders have been devm-allocated, they will be freed way before drm_mode_config_cleanup() is called. To avoid use-after-free conditions, we then must ensure that drm_encoder_cleanup() is called before the encoders are freed. v2: Use the new __drmm_simple_encoder_alloc() function v3: Use the new drmm_plain_simple_encoder_alloc() macro Fixes: c369cb27c267 ("drm/ingenic: Support multiple panels/bridges") Cc: <stable@vger.kernel.org> # 5.8+ Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- Notes: Use the V1 of this patch to fix v5.11 and older kernels. This V3 only applies on the current drm-misc-next branch. drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c index 7bb31fbee29d..b23011c1c5d9 100644 --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c @@ -1014,20 +1014,17 @@ static int ingenic_drm_bind(struct device *dev, bool has_components) bridge = devm_drm_panel_bridge_add_typed(dev, panel, DRM_MODE_CONNECTOR_DPI); - encoder = devm_kzalloc(dev, sizeof(*encoder), GFP_KERNEL); - if (!encoder) - return -ENOMEM; + encoder = drmm_plain_simple_encoder_alloc(drm, DRM_MODE_ENCODER_DPI); + if (IS_ERR(encoder)) { + ret = PTR_ERR(encoder); + dev_err(dev, "Failed to init encoder: %d\n", ret); + return ret; + } encoder->possible_crtcs = 1; drm_encoder_helper_add(encoder, &ingenic_drm_encoder_helper_funcs); - ret = drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_DPI); - if (ret) { - dev_err(dev, "Failed to init encoder: %d\n", ret); - return ret; - } - ret = drm_bridge_attach(encoder, bridge, NULL, 0); if (ret) { dev_err(dev, "Unable to attach bridge\n"); -- 2.29.2
WARNING: multiple messages have this Message-ID (diff)
From: Paul Cercueil <paul@crapouillou.net> To: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch> Cc: linux-mips@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Paul Cercueil <paul@crapouillou.net>, od@zcrc.me, Laurent Pinchart <Laurent.pinchart@ideasonboard.com>, stable@vger.kernel.org, Sam Ravnborg <sam@ravnborg.org> Subject: [PATCH v3 3/4] drm/ingenic: Register devm action to cleanup encoders Date: Sun, 24 Jan 2021 08:55:51 +0000 [thread overview] Message-ID: <20210124085552.29146-4-paul@crapouillou.net> (raw) In-Reply-To: <20210124085552.29146-1-paul@crapouillou.net> Since the encoders have been devm-allocated, they will be freed way before drm_mode_config_cleanup() is called. To avoid use-after-free conditions, we then must ensure that drm_encoder_cleanup() is called before the encoders are freed. v2: Use the new __drmm_simple_encoder_alloc() function v3: Use the new drmm_plain_simple_encoder_alloc() macro Fixes: c369cb27c267 ("drm/ingenic: Support multiple panels/bridges") Cc: <stable@vger.kernel.org> # 5.8+ Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- Notes: Use the V1 of this patch to fix v5.11 and older kernels. This V3 only applies on the current drm-misc-next branch. drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c index 7bb31fbee29d..b23011c1c5d9 100644 --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c @@ -1014,20 +1014,17 @@ static int ingenic_drm_bind(struct device *dev, bool has_components) bridge = devm_drm_panel_bridge_add_typed(dev, panel, DRM_MODE_CONNECTOR_DPI); - encoder = devm_kzalloc(dev, sizeof(*encoder), GFP_KERNEL); - if (!encoder) - return -ENOMEM; + encoder = drmm_plain_simple_encoder_alloc(drm, DRM_MODE_ENCODER_DPI); + if (IS_ERR(encoder)) { + ret = PTR_ERR(encoder); + dev_err(dev, "Failed to init encoder: %d\n", ret); + return ret; + } encoder->possible_crtcs = 1; drm_encoder_helper_add(encoder, &ingenic_drm_encoder_helper_funcs); - ret = drm_simple_encoder_init(drm, encoder, DRM_MODE_ENCODER_DPI); - if (ret) { - dev_err(dev, "Failed to init encoder: %d\n", ret); - return ret; - } - ret = drm_bridge_attach(encoder, bridge, NULL, 0); if (ret) { dev_err(dev, "Unable to attach bridge\n"); -- 2.29.2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2021-01-24 8:59 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 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 ` Paul Cercueil [this message] 2021-01-24 8:55 ` [PATCH v3 3/4] drm/ingenic: Register devm action to cleanup encoders 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=20210124085552.29146-4-paul@crapouillou.net \ --to=paul@crapouillou.net \ --cc=Laurent.pinchart@ideasonboard.com \ --cc=airlied@linux.ie \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mips@vger.kernel.org \ --cc=od@zcrc.me \ --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.