Skip to content

Commit 3adb23d

Browse files
Ma KeSasha Levin
authored andcommitted
drm/amd/display: Fix null check for pipe_ctx->plane_state in resource_build_scaling_params
[ Upstream commit 374c9fa ] 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: 3be5262 ("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 63e6a77) Cc: stable@vger.kernel.org Signed-off-by: Sasha Levin <sashal@kernel.org>
1 parent 4ffd15f commit 3adb23d

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -952,7 +952,8 @@ bool resource_build_scaling_params(struct pipe_ctx *pipe_ctx)
952952
DC_LOGGER_INIT(pipe_ctx->stream->ctx->logger);
953953

954954
/* Invalid input */
955-
if (!plane_state->dst_rect.width ||
955+
if (!plane_state ||
956+
!plane_state->dst_rect.width ||
956957
!plane_state->dst_rect.height ||
957958
!plane_state->src_rect.width ||
958959
!plane_state->src_rect.height) {

0 commit comments

Comments
 (0)