The drm_writeback_connector_cleanup have the signature:

     static void drm_writeback_connector_cleanup(
                struct drm_device *dev,
                struct drm_writeback_connector *wb_connector)

But it is stored and used as a drmres_release_t

    typedef void (*drmres_release_t)(struct drm_device *dev, void *res);

While the current code is valid and does not produce any warning, the
CFI runtime check (CONFIG_CFI_CLANG) can fail because the function
signature is not the same as drmres_release_t.

In order to fix this, change the function signature to match what is
expected by drmres_release_t.

Fixes: 1914ba2b91ea ("drm: writeback: Create drmm variants for 
drm_writeback_connector initialization")

Suggested-by: Mark Yacoub <markyac...@google.com>
Signed-off-by: Louis Chauvet <louis.chau...@bootlin.com>
---
 drivers/gpu/drm/drm_writeback.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/drm_writeback.c b/drivers/gpu/drm/drm_writeback.c
index edbeab88ff2b..2f5c40616d9d 100644
--- a/drivers/gpu/drm/drm_writeback.c
+++ b/drivers/gpu/drm/drm_writeback.c
@@ -350,10 +350,11 @@ EXPORT_SYMBOL(drm_writeback_connector_init_with_encoder);
  * clean up the attached encoder and the drm_connector.
  */
 static void drm_writeback_connector_cleanup(struct drm_device *dev,
-                                           struct drm_writeback_connector 
*wb_connector)
+                                           void *data)
 {
        unsigned long flags;
        struct drm_writeback_job *pos, *n;
+       struct drm_writeback_connector *wb_connector = data;
 
        delete_writeback_properties(dev);
        drm_property_blob_put(wb_connector->pixel_formats_blob_ptr);
@@ -405,7 +406,7 @@ int drmm_writeback_connector_init(struct drm_device *dev,
        if (ret)
                return ret;
 
-       ret = drmm_add_action_or_reset(dev, (void 
*)drm_writeback_connector_cleanup,
+       ret = drmm_add_action_or_reset(dev, drm_writeback_connector_cleanup,
                                       wb_connector);
        if (ret)
                return ret;

---
base-commit: b848cd418aebdb313364b4843f41fae82281a823
change-id: 20250428-drm-fix-writeback-cleanup-a1179f3b9691

Best regards,
-- 
Louis Chauvet <louis.chau...@bootlin.com>

Reply via email to