Commit b80a1c0f authored by Alex Hung's avatar Alex Hung Committed by Gu Bowen
Browse files

drm/amd/display: Run DC_LOG_DC after checking link->link_enc 

stable inclusion
from stable-v6.6.51
commit 874e3bb302f97b94ac548959ec4f925b8e7b45e2
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IARWBK
CVE: CVE-2024-46776

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



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

[ Upstream commit 3a82f62b0d9d7687eac47603bb6cd14a50fa718b ]

[WHAT]
The DC_LOG_DC should be run after link->link_enc is checked, not before.

This fixes 1 REVERSE_INULL issue reported by Coverity.

Reviewed-by: default avatarRodrigo Siqueira <rodrigo.siqueira@amd.com>
Signed-off-by: default avatarAlex Hung <alex.hung@amd.com>
Tested-by: default avatarDaniel Wheeler <daniel.wheeler@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarGu Bowen <gubowen5@huawei.com>
parent 91ff8f4b

drivers/gpu/drm/amd/display/dc/link/link_factory.c

+3 −3
Original line number Diff line number Diff line
@@ -629,14 +629,14 @@ static bool construct_phy(struct dc_link *link, 
	link->link_enc =

		link->dc->res_pool->funcs->link_enc_create(dc_ctx, &enc_init_data);



	DC_LOG_DC("BIOS object table - DP_IS_USB_C: %d", link->link_enc->features.flags.bits.DP_IS_USB_C);

	DC_LOG_DC("BIOS object table - IS_DP2_CAPABLE: %d", link->link_enc->features.flags.bits.IS_DP2_CAPABLE);



	if (!link->link_enc) {

		DC_ERROR("Failed to create link encoder!\n");

		goto link_enc_create_fail;

	}



	DC_LOG_DC("BIOS object table - DP_IS_USB_C: %d", link->link_enc->features.flags.bits.DP_IS_USB_C);

	DC_LOG_DC("BIOS object table - IS_DP2_CAPABLE: %d", link->link_enc->features.flags.bits.IS_DP2_CAPABLE);



	/* Update link encoder tracking variables. These are used for the dynamic

	 * assignment of link encoders to streams.

	 */