On Fri, Nov 15, 2024 at 06:41:59PM +0200, Imre Deak wrote:
> After an error during adding an MST connector the MST port and the
> intel_connector object could be leaked, fix this up.
>
> Signed-off-by: Imre Deak <imre.d...@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.v...@intel.com>
> ---
> drivers/gpu/drm/i915/display/intel_dp_mst.c | 17 +++++++++--------
> 1 file changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> index d91a1d1fb26f4..70daa9131c92d 100644
> --- a/drivers/gpu/drm/i915/display/intel_dp_mst.c
> +++ b/drivers/gpu/drm/i915/display/intel_dp_mst.c
> @@ -1731,11 +1731,8 @@ static struct drm_connector
> *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
>
> ret = drm_connector_init_core(display->drm, connector,
> &intel_dp_mst_connector_funcs,
> DRM_MODE_CONNECTOR_DisplayPort);
> - 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);
> @@ -1750,12 +1747,12 @@ static struct drm_connector
> *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
>
> ret = drm_connector_attach_encoder(&intel_connector->base, enc);
> if (ret)
> - goto err;
> + goto err_cleanup_connector;
> }
>
> ret = intel_dp_mst_add_properties(intel_dp, connector, pathprop);
> if (ret)
> - goto err;
> + goto err_cleanup_connector;
>
> ret = intel_dp_hdcp_init(dig_port, intel_connector);
> if (ret)
> @@ -1766,8 +1763,12 @@ static struct drm_connector
> *intel_dp_add_mst_connector(struct drm_dp_mst_topolo
>
> 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;
> }
>
> --
> 2.44.2
>
