Commit 967f54ea authored by Srinivasan Shanmugam's avatar Srinivasan Shanmugam Committed by Zicheng Qu
Browse files

drm/amd/display: Add null check for pipe_ctx->plane_state in dcn20_program_pipe

stable inclusion
from stable-v6.11.3
commit 65a6fee22d5cfa645cb05489892dc9cd3d142fc2
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAYRAY
CVE: CVE-2024-49914

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=65a6fee22d5cfa645cb05489892dc9cd3d142fc2



--------------------------------

[ Upstream commit 8e4ed3cf1642df0c4456443d865cff61a9598aa8 ]

This commit addresses a null pointer dereference issue in the
`dcn20_program_pipe` function. The 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.

Reported by smatch:
drivers/gpu/drm/amd/amdgpu/../display/dc/hwss/dcn20/dcn20_hwseq.c:1925 dcn20_program_pipe() error: we previously assumed 'pipe_ctx->plane_state' could be null (see line 1877)

Cc: Tom Chung <chiahsuan.chung@amd.com>
Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Cc: Roman Li <roman.li@amd.com>
Cc: Alex Hung <alex.hung@amd.com>
Cc: Aurabindo Pillai <aurabindo.pillai@amd.com>
Cc: Harry Wentland <harry.wentland@amd.com>
Cc: Hamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: default avatarSrinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Reviewed-by: default avatarTom Chung <chiahsuan.chung@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Conflicts:
	drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c
	drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c
[The stable version 5.10 is missing patch 65a6fee22d5cfa645cb05489892dc9cd3d142fc2,
which was pulled from 6.11. Manually removed unnecessary code, such as
if (pipe_ctx->update_flags.bits.det_size),
if (hws->funcs.populate_mcm_luts),
if (pipe_ctx->update_flags.bits.enable),
if ((pipe_ctx->plane_state && pipe_ctx->plane_state->visible)).
The purpose of this patch is to check if pipe_ctx->plane_state is not
null before using its properties. Other extraneous code from higher
versions is unrelated to the current patch and has been removed.]
Signed-off-by: default avatarZicheng Qu <quzicheng@huawei.com>
parent d14b2a1c
Loading
Loading
Loading
Loading
+9 −5
Original line number Diff line number Diff line
@@ -1601,16 +1601,20 @@ static void dcn20_program_pipe(
			dc->res_pool->hubbub->funcs->force_wm_propagate_to_pipes(dc->res_pool->hubbub);
	}

	if (pipe_ctx->update_flags.raw || pipe_ctx->plane_state->update_flags.raw || pipe_ctx->stream->update_flags.raw)
	if (pipe_ctx->update_flags.raw ||
		(pipe_ctx->plane_state && pipe_ctx->plane_state->update_flags.raw) ||
		pipe_ctx->stream->update_flags.raw)
		dcn20_update_dchubp_dpp(dc, pipe_ctx, context);

	if (pipe_ctx->update_flags.bits.enable
			|| pipe_ctx->plane_state->update_flags.bits.hdr_mult)
	if (pipe_ctx->update_flags.bits.enable ||
	    (pipe_ctx->plane_state && pipe_ctx->plane_state->update_flags.bits.hdr_mult))
		hws->funcs.set_hdr_multiplier(pipe_ctx);

	if (pipe_ctx->update_flags.bits.enable ||
			pipe_ctx->plane_state->update_flags.bits.in_transfer_func_change ||
			pipe_ctx->plane_state->update_flags.bits.gamma_change)
			(pipe_ctx->plane_state &&
			pipe_ctx->plane_state->update_flags.bits.in_transfer_func_change) ||
			(pipe_ctx->plane_state &&
			pipe_ctx->plane_state->update_flags.bits.gamma_change))
		hws->funcs.set_input_transfer_func(dc, pipe_ctx, pipe_ctx->plane_state);

	/* dcn10_translate_regamma_to_hw_format takes 750us to finish