Commit dd9cf542 authored by Srinivasan Shanmugam's avatar Srinivasan Shanmugam Committed by Liao Chen
Browse files

drm/amd/display: Add NULL test for 'timing generator' in 'dcn21_set_pipe()' 

mainline inclusion
from mainline-v6.8-rc4
commit 66951d98d9bf45ba25acf37fe0747253fafdf298
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/I9DNF6
CVE: CVE-2024-26661

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=66951d98d9bf45ba25acf37fe0747253fafdf298



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

In "u32 otg_inst = pipe_ctx->stream_res.tg->inst;"
pipe_ctx->stream_res.tg could be NULL, it is relying on the caller to
ensure the tg is not NULL.

Fixes: 474ac4a8 ("drm/amd/display: Implement some asic specific abm call backs.")
Cc: Yongqiang Sun <yongqiang.sun@amd.com>
Cc: Anthony Koo <Anthony.Koo@amd.com>
Cc: Rodrigo Siqueira <Rodrigo.Siqueira@amd.com>
Cc: Aurabindo Pillai <aurabindo.pillai@amd.com>
Signed-off-by: default avatarSrinivasan Shanmugam <srinivasan.shanmugam@amd.com>
Reviewed-by: default avatarAnthony Koo <Anthony.Koo@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarLiao Chen <liaochen4@huawei.com>
parent 3fd44f97

drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hwseq.c

+7 −1
Original line number Diff line number Diff line
@@ -179,9 +179,15 @@ void dcn21_set_abm_immediate_disable(struct pipe_ctx *pipe_ctx) 
void dcn21_set_pipe(struct pipe_ctx *pipe_ctx)

{

	struct abm *abm = pipe_ctx->stream_res.abm;

	uint32_t otg_inst = pipe_ctx->stream_res.tg->inst;

	struct timing_generator *tg = pipe_ctx->stream_res.tg;

	struct panel_cntl *panel_cntl = pipe_ctx->stream->link->panel_cntl;

	struct dmcu *dmcu = pipe_ctx->stream->ctx->dc->res_pool->dmcu;

	uint32_t otg_inst;



	if (!abm && !tg && !panel_cntl)

		return;



	otg_inst = tg->inst;



	if (dmcu) {

		dce110_set_pipe(pipe_ctx);