]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/amd/display: Check BIOS images before it is used
authorAlex Hung <alex.hung@amd.com>
Mon, 3 Jun 2024 14:24:13 +0000 (08:24 -0600)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 14 Dec 2024 18:54:52 +0000 (19:54 +0100)
commit 8b0ddf19cca2a352b2a7e01d99d3ba949a99c84c upstream.

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: Harry Wentland <harry.wentland@amd.com>
Acked-by: Hamza Mahfooz <hamza.mahfooz@amd.com>
Signed-off-by: Alex Hung <alex.hung@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Keerthana K <keerthana.kalyanasundaram@broadcom.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/gpu/drm/amd/display/dc/bios/bios_parser.c

index 9b8ea6e9a2b96081efdac0b0631802d19ef762b4..0f686e363d308d53c036490ae1b7e01363572360 100644 (file)
@@ -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))
@@ -1031,6 +1034,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));
 
@@ -1104,6 +1109,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;
@@ -1631,6 +1638,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;
@@ -1711,6 +1720,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);