]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
drm/display: bridge_connector: get/put the panel_bridge
authorLuca Ceresoli <luca.ceresoli@bootlin.com>
Fri, 17 Oct 2025 16:15:06 +0000 (18:15 +0200)
committerLuca Ceresoli <luca.ceresoli@bootlin.com>
Mon, 3 Nov 2025 11:17:54 +0000 (12:17 +0100)
The panel_bridge pointer is taken inside the loop and used after the
loop. Being a local variable, use a cleanup action to ensure it is put on
return.

Based on the code structure the panel_bridge pointer might be assigned
during multiple loop iterations. Even though this is probably not possible
in the practice, ensure there is no reference leak by putting the reference
to the old value before overwriting with the new value.

Reviewed-by: Louis Chauvet <louis.chauvet@bootlin.com>
Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Tested-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> # db410c
Tested-by: Geert Uytterhoeven <geert+renesas@glider.be>
Tested-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
Tested-by: Tommaso Merciai <tommaso.merciai.xr@bp.renesas.com>
Tested-by: Marek Szyprowski <m.szyprowski@samsung.com>
Link: https://patch.msgid.link/20251017-drm-bridge-alloc-getput-bridge-connector-fix-hdmi_cec-v2-3-667abf6d47c0@bootlin.com
Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
drivers/gpu/drm/display/drm_bridge_connector.c

index 95ccf86527129edaa6fcc75c6202985e73c46da8..a2d30cf9e06df44b89456b5aba8198ee1e5d5601 100644 (file)
@@ -652,7 +652,7 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm,
        struct drm_bridge_connector *bridge_connector;
        struct drm_connector *connector;
        struct i2c_adapter *ddc = NULL;
-       struct drm_bridge *panel_bridge = NULL;
+       struct drm_bridge *panel_bridge __free(drm_bridge_put) = NULL;
        unsigned int supported_formats = BIT(HDMI_COLORSPACE_RGB);
        unsigned int max_bpc = 8;
        bool support_hdcp = false;
@@ -787,8 +787,10 @@ struct drm_connector *drm_bridge_connector_init(struct drm_device *drm,
                if (bridge->ddc)
                        ddc = bridge->ddc;
 
-               if (drm_bridge_is_panel(bridge))
-                       panel_bridge = bridge;
+               if (drm_bridge_is_panel(bridge)) {
+                       drm_bridge_put(panel_bridge);
+                       panel_bridge = drm_bridge_get(bridge);
+               }
 
                if (bridge->support_hdcp)
                        support_hdcp = true;