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

!12605 fix CVE-2024-46802 

Merge Pull Request from: @ci-robot 
 
PR sync from: Heyuan Wang <wangheyuan2@h-partners.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/GK3CWFY5REMDK6WYJLD6AXJYPNKQ5ES5/ 
From: Yu Liao <liaoyu15@huawei.com>

Yu Liao (1):
  drm/amd/display: fix mixed declarations warning

winstang (1):
  drm/amd/display: added NULL check at start of dc_validate_stream


-- 
2.25.1
 
https://gitee.com/src-openeuler/kernel/issues/IAU9N4 
 
Link:https://gitee.com/openeuler/kernel/pulls/12605

 

Reviewed-by: default avatarXiongfeng Wang <wangxiongfeng2@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parents 693eeef5 3d109770

drivers/gpu/drm/amd/display/dc/core/dc_resource.c

+8 −2
Original line number Diff line number Diff line
@@ -2914,10 +2914,16 @@ void resource_build_bit_depth_reduction_params(struct dc_stream_state *stream, 


enum dc_status dc_validate_stream(struct dc *dc, struct dc_stream_state *stream)

{

	struct dc_link *link = stream->link;

	struct timing_generator *tg = dc->res_pool->timing_generators[0];

	struct dc_link *link;

	struct timing_generator *tg;

	enum dc_status res = DC_OK;



	if (dc == NULL || stream == NULL)

		return DC_ERROR_UNEXPECTED;



	link = stream->link;

	tg = dc->res_pool->timing_generators[0];



	calculate_phy_pix_clks(stream);



	if (!tg->funcs->validate_timing(tg, &stream->timing))