Commit c63eb3a0 authored Dec 06, 2024 by Rodrigo Siqueira Committed by Cheng Yu Dec 06, 2024

drm/amd/display: Check null pointer before try to access it

stable inclusion
from stable-v6.11.3
commit 2002ccb93004e76a471b180560accb2c1f850f35
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAYRAN
CVE: CVE-2024-49906

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



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

[ Upstream commit 1b686053c06ffb9f4524b288110cf2a831ff7a25 ]

[why & how]
Change the order of the pipe_ctx->plane_state check to ensure that
plane_state is not null before accessing it.

Reviewed-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Signed-off-by: Tom Chung <chiahsuan.chung@amd.com>
Tested-by: Daniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha 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 conflict is mainly due to e53524cdcc02("drm/amd/display: Refactor
HWSS into component folder") not being merged, and some contextual
differences.]
Signed-off-by: Cheng Yu <serein.chengyu@huawei.com>

parent f0c88450

drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -1742,13 +1742,17 @@ static void dcn20_program_pipe(
		(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 &&
		if ((pipe_ctx->plane_state && pipe_ctx->plane_state->update_flags.bits.hdr_mult) \|\|
		pipe_ctx->update_flags.bits.enable)
		hws->funcs.set_hdr_multiplier(pipe_ctx);

		if ((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) \|\|
		(pipe_ctx->plane_state &&
		pipe_ctx->plane_state->update_flags.bits.lut_3d))
		pipe_ctx->plane_state->update_flags.bits.lut_3d) \|\|
		pipe_ctx->update_flags.bits.enable)
		hws->funcs.set_input_transfer_func(dc, pipe_ctx, pipe_ctx->plane_state);

		/* dcn10_translate_regamma_to_hw_format takes 750us to finish