[PATCH] drm/amd/display: Fix logger leak on perf trace allocation failure

[PATCH] drm/amd/display: Fix logger leak on perf trace allocation failure

[Jackie Liu]

From: Jackie Liu <liuyun01@kylinos.cn>

dc_construct_ctx() allocates a logger and stores an alias in dc->dml.logger
before allocating the performance trace object. If dc_perf_trace_create()
fails, the function frees dc_ctx without releasing the logger. Since
dc->ctx is assigned only after the trace allocation succeeds,
dc_destruct() cannot reclaim the logger on this error path.

Free the logger before discarding dc_ctx and clear dc->dml.logger to avoid
leaving a dangling alias after the failed construction.

Fixes: 5d72e247e58c ("drm/amd/display: switch DC over to the new DRM logging macros")
Cc: stable@vger.kernel.org
Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
---
 drivers/gpu/drm/amd/display/dc/core/dc.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
index 1143916391e79..03179633cd036 100644
--- a/drivers/gpu/drm/amd/display/dc/core/dc.c
+++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
@@ -1022,6 +1022,8 @@ static bool dc_construct_ctx(struct dc *dc,
 
 	dc_ctx->perf_trace = dc_perf_trace_create();
 	if (!dc_ctx->perf_trace) {
+		kfree(dc_ctx->logger);
+		dc->dml.logger = NULL;
 		kfree(dc_ctx);
 		ASSERT_CRITICAL(false);
 		return false;
-- 
2.43.0

Re: [PATCH] drm/amd/display: Fix logger leak on perf trace allocation failure

[Wayne Lin]

Reviewed-by: Wayne Lin <Wayne.Lin@amd.com>

On Mon, 26 Oct 2026 19:10:47 +0800, Jackie Liu wrote:
> From: Jackie Liu <liuyun01@kylinos.cn>
>
> dc_construct_ctx() allocates a logger and stores an alias in dc->dml.logger
> before allocating the performance trace object. If dc_perf_trace_create()
> fails, the function frees dc_ctx without releasing the logger. Since
> dc->ctx is assigned only after the trace allocation succeeds,
> dc_destruct() cannot reclaim the logger on this error path.
>
> Free the logger before discarding dc_ctx and clear dc->dml.logger to avoid
> leaving a dangling alias after the failed construction.
>
> Fixes: 5d72e247e58c ("drm/amd/display: switch DC over to the new DRM logging macros")
> Cc: stable@vger.kernel.org
> Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
> ---
>  drivers/gpu/drm/amd/display/dc/core/dc.c | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/drivers/gpu/drm/amd/display/dc/core/dc.c b/drivers/gpu/drm/amd/display/dc/core/dc.c
> index 1143916391e79..03179633cd036 100644
> --- a/drivers/gpu/drm/amd/display/dc/core/dc.c
> +++ b/drivers/gpu/drm/amd/display/dc/core/dc.c
> @@ -1022,6 +1022,8 @@ static bool dc_construct_ctx(struct dc *dc,
>  
>  	dc_ctx->perf_trace = dc_perf_trace_create();
>  	if (!dc_ctx->perf_trace) {
> +		kfree(dc_ctx->logger);
> +		dc->dml.logger = NULL;
>  		kfree(dc_ctx);
>  		ASSERT_CRITICAL(false);
>  		return false;
> -- 
> 2.43.0
>
>