github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-05-26 08:02:27 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

drm/i915/dp_mst: Fix error handling while adding a connector

Browse Source 
After an error during adding an MST connector the MST port and the
intel_connector object could be leaked, fix this up.

Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Imre Deak <imre.deak@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250108151916.491113-2-imre.deak@intel.com
This commit is contained in:
Imre Deak 2025-01-08 17:19:12 +02:00
parent c132ec36fc
commit 1abf834951
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/gpu/drm/i915/display/intel_dp_mst.c
View File

@ -1717,11 +1717,8 @@ mst_topology_add_connector(struct drm_dp_mst_topology_mgr *mgr,
ret = drm_connector_dynamic_init(display->drm, connector, &mst_connector_funcs,
DRM_MODE_CONNECTOR_DisplayPort, NULL);
if (ret) {
drm_dp_mst_put_port_malloc(port);
intel_connector_free(intel_connector);
return NULL;
}
if (ret)
goto err_put_port;
intel_connector->dp.dsc_decompression_aux = drm_dp_mst_dsc_aux_for_port(port);
intel_dp_mst_read_decompression_port_dsc_caps(intel_dp, intel_connector);
@ -1736,12 +1733,12 @@ mst_topology_add_connector(struct drm_dp_mst_topology_mgr *mgr,
ret = drm_connector_attach_encoder(&intel_connector->base, enc);
if (ret)
goto err;
goto err_cleanup_connector;
}
ret = mst_topology_add_connector_properties(intel_dp, connector, pathprop);
if (ret)
goto err;
goto err_cleanup_connector;
ret = intel_dp_hdcp_init(dig_port, intel_connector);
if (ret)
@ -1750,8 +1747,12 @@ mst_topology_add_connector(struct drm_dp_mst_topology_mgr *mgr,
return connector;
err:
err_cleanup_connector:
drm_connector_cleanup(connector);
err_put_port:
drm_dp_mst_put_port_malloc(port);
intel_connector_free(intel_connector);
return NULL;
}