]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/amd/display: Fix null check for pipe_ctx->plane_state in resource_build_scaling_p...
authorMa Ke <make24@iscas.ac.cn>
Wed, 26 Feb 2025 08:37:31 +0000 (16:37 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 10 Apr 2025 12:30:52 +0000 (14:30 +0200)
[ Upstream commit 374c9faac5a763a05bc3f68ad9f73dab3c6aec90 ]

Null pointer dereference issue could occur when pipe_ctx->plane_state
is null. The fix adds a check to ensure 'pipe_ctx->plane_state' is not
null before accessing. This prevents a null pointer dereference.

Found by code review.

Fixes: 3be5262e353b ("drm/amd/display: Rename more dc_surface stuff to plane_state")
Reviewed-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Ma Ke <make24@iscas.ac.cn>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
(cherry picked from commit 63e6a77ccf239337baa9b1e7787cde9fa0462092)
Cc: stable@vger.kernel.org
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/amd/display/dc/core/dc_resource.c

index 9564905c2c797aa9b486b1d7a26a9b497f39bff2..8dace2e401bbd3a0c56b7891576992472f444cf2 100644 (file)
@@ -952,7 +952,8 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx)
        DC_LOGGER_INIT(pipe_ctx->stream->ctx->logger);
 
        /* Invalid input */
-       if (!plane_state->dst_rect.width ||
+       if (!plane_state ||
+                       !plane_state->dst_rect.width ||
                        !plane_state->dst_rect.height ||
                        !plane_state->src_rect.width ||
                        !plane_state->src_rect.height) {