Unverified Commit c2f1662c authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!14102 OLK-6.6-fix-CVE-2024-49906 

Merge Pull Request from: @ci-robot 
 
PR sync from: Cheng Yu <serein.chengyu@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/PG7TQR24OGPWNABJ22CXOUSY2QUFVABR/ 
OLK-6.6-fix-CVE-2024-49906

Rodrigo Siqueira (1):
  drm/amd/display: Check null pointer before try to access it

Wayne Lin (1):
  drm/amd/display: Check null pointer before try to access it


-- 
2.25.1
 
https://gitee.com/src-openeuler/kernel/issues/IAYRAN 
 
Link:https://gitee.com/openeuler/kernel/pulls/14102

 

Reviewed-by: default avatarZucheng Zheng <zhengzucheng@huawei.com>
Signed-off-by: default avatarZhang Peng <zhangpeng362@huawei.com>
parents 7c532e2c 827c5175

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

+7 −9
Original line number Diff line number Diff line
@@ -1738,17 +1738,15 @@ static void dcn20_program_pipe( 
	    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 && pipe_ctx->plane_state->update_flags.bits.hdr_mult))

	if (pipe_ctx->plane_state && (pipe_ctx->update_flags.bits.enable ||

	    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 &&

	     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))

	if (pipe_ctx->plane_state &&

	    (pipe_ctx->plane_state->update_flags.bits.in_transfer_func_change ||

	    pipe_ctx->plane_state->update_flags.bits.gamma_change ||

	    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