Commit 9f895975 authored by Alex Hung's avatar Alex Hung Committed by Kaixiong Yu
Browse files

drm/amd/display: Check BIOS images before it is used 

stable inclusion
from stable-v6.6.50
commit e50bec62acaeec03afc6fa5dfb2426e52d049cf5
category: bugfix
bugzilla: https://gitee.com/src-openeuler/kernel/issues/IAU9OU
CVE: CVE-2024-46809

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



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

[ Upstream commit 8b0ddf19cca2a352b2a7e01d99d3ba949a99c84c ]

BIOS images may fail to load and null checks are added before they are
used.

This fixes 6 NULL_RETURNS issues reported by Coverity.

Reviewed-by: default avatarHarry Wentland <harry.wentland@amd.com>
Acked-by: default avatarHamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: default avatarAlex Hung <alex.hung@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Conflicts:
         drivers/gpu/drm/amd/display/dc/bios/bios_parser.c
[Because OLK-5.10 did not merge the mainline commit bd3fe587
("drm/amdgpu: Replace one-elements array with flex-array members")]
Signed-off-by: default avatarKaixiong Yu <yukaixiong@huawei.com>
parent 4c009121

drivers/gpu/drm/amd/display/dc/bios/bios_parser.c

+14 −0
Original line number Diff line number Diff line
@@ -664,6 +664,9 @@ static enum bp_result get_ss_info_v3_1( 


	ss_table_header_include = GET_IMAGE(ATOM_ASIC_INTERNAL_SS_INFO_V3,

		DATA_TABLES(ASIC_InternalSS_Info));

	if (!ss_table_header_include)

		return BP_RESULT_UNSUPPORTED;



	table_size =

		(le16_to_cpu(ss_table_header_include->sHeader.usStructureSize)

				- sizeof(ATOM_COMMON_TABLE_HEADER))
@@ -1030,6 +1033,8 @@ static enum bp_result get_ss_info_from_internal_ss_info_tbl_V2_1( 


	header = GET_IMAGE(ATOM_ASIC_INTERNAL_SS_INFO_V2,

		DATA_TABLES(ASIC_InternalSS_Info));

	if (!header)

        	return result;



	memset(info, 0, sizeof(struct spread_spectrum_info));
@@ -1102,6 +1107,8 @@ static enum bp_result get_ss_info_from_ss_info_table( 
	get_atom_data_table_revision(header, &revision);



	tbl = GET_IMAGE(ATOM_SPREAD_SPECTRUM_INFO, DATA_TABLES(SS_Info));

	if (!tbl)

			return result;



	if (1 != revision.major || 2 > revision.minor)

		return result;
@@ -1634,6 +1641,8 @@ static uint32_t get_ss_entry_number_from_ss_info_tbl( 


	tbl = GET_IMAGE(ATOM_SPREAD_SPECTRUM_INFO,

			DATA_TABLES(SS_Info));

	if (!tbl)

		return number;



	if (1 != revision.major || 2 > revision.minor)

		return number;
@@ -1712,6 +1721,8 @@ static uint32_t get_ss_entry_number_from_internal_ss_info_tbl_v2_1( 


	header_include = GET_IMAGE(ATOM_ASIC_INTERNAL_SS_INFO_V2,

			DATA_TABLES(ASIC_InternalSS_Info));

	if (!header_include)

			return 0;



	size = (le16_to_cpu(header_include->sHeader.usStructureSize)

			- sizeof(ATOM_COMMON_TABLE_HEADER))
@@ -1748,6 +1759,9 @@ static uint32_t get_ss_entry_number_from_internal_ss_info_tbl_V3_1( 


	header_include = GET_IMAGE(ATOM_ASIC_INTERNAL_SS_INFO_V3,

			DATA_TABLES(ASIC_InternalSS_Info));

	if (!header_include)

		return number;



	size = (le16_to_cpu(header_include->sHeader.usStructureSize) -

			sizeof(ATOM_COMMON_TABLE_HEADER)) /

					sizeof(ATOM_ASIC_SS_ASSIGNMENT_V3);