Commit a3f433c5 authored by Luca Ceresoli's avatar Luca Ceresoli
Browse files

drm/display: bridge_connector: get/put the panel_bridge 



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: default avatarLouis Chauvet <louis.chauvet@bootlin.com>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com>
Tested-by: Dmitry Baryshkov <dmitry.baryshkov@oss.qualcomm.com> # db410c
Tested-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Tested-by: default avatarNicolas Frattaroli <nicolas.frattaroli@collabora.com>
Tested-by: default avatarTommaso Merciai <tommaso.merciai.xr@bp.renesas.com>
Tested-by: default avatarMarek 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: default avatarLuca Ceresoli <luca.ceresoli@bootlin.com>
parent 13adb8c9

drivers/gpu/drm/display/drm_bridge_connector.c

+5 −3
Original line number Diff line number Diff line
@@ -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;