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

!9305 CVE-2024-26661 following bugfix 

Merge Pull Request from: @ci-robot 
 
PR sync from: Liao Chen <liaochen4@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/WL3BSIZ3WRCAMBKHFG74JWMZZBTCXRXA/ 
revert it, merge its precedent, and apply it back.

Dan Carpenter (1):

Liao Chen (1):

Srinivasan Shanmugam (1):
  drm/amd/display: Fix 'panel_cntl' could be null in
    'dcn21_set_backlight_level()'


-- 
2.34.1
 
https://gitee.com/src-openeuler/kernel/issues/I9DNF6 
 
Link:https://gitee.com/openeuler/kernel/pulls/9305

 

Reviewed-by: default avatarZhang Jianhua <chris.zjh@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 6c36e2ab d4f07450

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

+7 −1
Original line number Diff line number Diff line
@@ -205,8 +205,14 @@ bool dcn21_set_backlight_level(struct pipe_ctx *pipe_ctx, 
	union dmub_rb_cmd cmd;

	struct dc_context *dc = pipe_ctx->stream->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;

	uint32_t otg_inst;



	if (!abm || !tg || !panel_cntl)

		return false;



	otg_inst = tg->inst;



	if (dc->dc->res_pool->dmcu) {

		dce110_set_backlight_level(pipe_ctx, backlight_pwm_u16_16, frame_ramp);