GPU: drm: meson: inline call to drm_simple_encoder_init()
PATCH 1/1 GPU: drm: meson: inline call to drm_simple_encoder_init()
This commit inlines the function drm_simple_encoder_init for the meson driver. It replaces the simple encoder init call with drm_encoder_init and a custom cleanup struct.
--- drivers/gpu/drm/meson/meson_encoder_hdmi.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/meson/meson_encoder_hdmi.c +7 -2
@@ -44,6 +44,10 @@ struct meson_encoder_hdmi {struct cec_notifier *cec_notifier; }; +static const struct drm_encoder_funcs drm_simple_encoder_funcs_cleanup = { + .destroy = drm_encoder_cleanup, +}; +#define bridge_to_meson_encoder_hdmi (x) \ container_of(x, struct meson_encoder_hdmi, bridge)
@@ -407,8 +411,9 @@ int meson_encoder_hdmi_probe(struct meson_drm *priv) meson_encoder_hdmi->priv = priv;/* Encoder */ - ret =drm_simple_encoder_init (priv->drm, &meson_encoder_hdmi->encoder, -DRM_MODE_ENCODER_TMDS ); + ret =drm_encoder_init (priv->drm, &meson_encoder_hdmi->encoder, + &drm_simple_encoder_funcs_cleanup, +DRM_MODE_ENCODER_TMDS ,NULL );if (ret) {dev_err_probe (priv->dev, ret,"Failed to init HDMI encoder\n" ); goto err_put_node;
Signature · 1 line
2.43.0
[email protected]
AI reviewThank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
Thank you for your contribution! Sashiko AI review found 2 potential issue(s) to consider:
New issues:
- [Low] The commit message claims to inline drm_simple_encoder_init() for the meson driver, but it only modifies the HDMI encoder, leaving the deprecated helper in use by other encoders in the same driver.
Pre-existing issues:
- [High] The meson_encoder_hdmi structure (which embeds struct drm_encoder) is allocated with devm_drm_bridge_alloc(), but the encoder is initialized with drm_encoder_init(). This creates a mismatch in lifecycles that leads to a use-after-free when the platform device is unbound but userspace still holds a reference to the DRM device. --
--- Patch [1]: [PATCH] GPU: drm: meson: inline call to drm_simple_encoder_init() --- commit bb202202974455054588168b82acfc49ff85b23f
Author: Liam Zuiderhoek <[email protected]>
GPU: drm: meson: inline call to drm_simple_encoder_init()
This commit inlines the function drm_simple_encoder_init for the meson driver. It replaces the simple encoder init call with drm_encoder_init and a custom cleanup struct.
Quoted 3 lines
This commit inlines the function
drm_simple_encoder_initfor the meson driver. It replaces the simple encoder init call withdrm_encoder_initand a custom cleanup struct.
[Severity: Low]
Does this commit miss updating other encoders in the meson driver?
The commit message implies it inlines the function for the meson driver as a whole, but meson_encoder_cvbs_probe() in meson_encoder_cvbs.c and meson_encoder_dsi_probe() in meson_encoder_dsi.c still use drm_simple_encoder_init().
Additionally, is the include for <drm/drm_simple_kms_helper.h> still needed in meson_encoder_hdmi.c now that the helper has been open-coded?
Quoted 4 lines
drivers/gpu/drm/meson/meson_encoder_hdmi.c +0
-0
[ ... ]
drivers/gpu/drm/meson/meson_encoder_hdmi.c int meson_encoder_hdmi_probe(struct meson_drm *priv) · line 416
Quoted 9 lines
drivers/gpu/drm/meson/meson_encoder_hdmi.c +3
-2@@ -407,8 +411,9 @@ int meson_encoder_hdmi_probe(struct meson_drm *priv) meson_encoder_hdmi->priv = priv;/* Encoder */ - ret =drm_simple_encoder_init (priv->drm, &meson_encoder_hdmi->encoder, -DRM_MODE_ENCODER_TMDS ); + ret =drm_encoder_init (priv->drm, &meson_encoder_hdmi->encoder, + &drm_simple_encoder_funcs_cleanup, +DRM_MODE_ENCODER_TMDS ,NULL );
[Severity: High]
This is a pre-existing issue, but does this allocation lifecycle mismatch lead to a use-after-free?
Looking at meson_encoder_hdmi_probe(), the structure embedding the encoder is allocated with devm_drm_bridge_alloc(), tying its lifetime to the platform device:
meson_encoder_hdmi_probe() {
...
meson_encoder_hdmi = devm_drm_bridge_alloc(priv->dev, ...);
...
}However, the encoder is initialized here with drm_encoder_init(), tying its cleanup to the DRM device's release.
If the platform device is unbound, devres automatically frees meson_encoder_hdmi. If a userspace process holds an open file descriptor to the DRM device during unbind, the DRM device outlives the platform device.
When the userspace process eventually closes the fd, drm_dev_release() calls drm_mode_config_cleanup(), which iterates over the mode config list and accesses the freed meson_encoder_hdmi->encoder to call its destroy callback.
Signature · 1 line
Sashiko AI review · https://sashiko.dev/#/patchset/[email protected]?part=1
Martin Blumenstingl
reviewerHello,
Quoted 6 lines · Liam Zuiderhoek
This commit inlines the function
drm_simple_encoder_initfor the meson driver. It replaces the simple encoder init call withdrm_encoder_initand a custom cleanup struct.Signed-off-by Liam Zuiderhoek <[email protected]>
What about meson_encoder_dsi and meson_encoder_cvbs?
For all three there's already another series - maybe you can help review it: [0]
Thank you and best regards,
Martin
[0] https://lore.kernel.org/linux-amlogic/[email protected]/