[PATCH] drm/amd: Fix UBSAN array-index-out-of-bounds for Polaris and Tonga

Mario Limonciello mario.limonciello at amd.com
Thu Oct 5 13:45:17 UTC 2023


On 10/4/2023 16:50, Alex Deucher wrote:
> On Wed, Oct 4, 2023 at 5:42 PM Mario Limonciello
> <mario.limonciello at amd.com> wrote:
>>
>> For pptable structs that use flexible array sizes, use flexible arrays.
>>
>> Link: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2036742
>> Signed-off-by: Mario Limonciello <mario.limonciello at amd.com>
> 
> Acked-by: Alex Deucher <alexander.deucher at amd.com>

Thanks, can you also review the similar (but different) series of the 
other variable arrays?

https://lore.kernel.org/amd-gfx/20231004202253.182540-1-mario.limonciello@amd.com/T/#t

> 
>> ---
>>  From this bug report there are more to fix
>>   .../gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h    | 12 ++++++------
>>   1 file changed, 6 insertions(+), 6 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h
>> index 57bca1e81d3a..9fcad69a9f34 100644
>> --- a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h
>> +++ b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h
>> @@ -164,7 +164,7 @@ typedef struct _ATOM_Tonga_State {
>>   typedef struct _ATOM_Tonga_State_Array {
>>          UCHAR ucRevId;
>>          UCHAR ucNumEntries;             /* Number of entries. */
>> -       ATOM_Tonga_State entries[1];    /* Dynamically allocate entries. */
>> +       ATOM_Tonga_State entries[];     /* Dynamically allocate entries. */
>>   } ATOM_Tonga_State_Array;
>>
>>   typedef struct _ATOM_Tonga_MCLK_Dependency_Record {
>> @@ -210,7 +210,7 @@ typedef struct _ATOM_Polaris_SCLK_Dependency_Record {
>>   typedef struct _ATOM_Polaris_SCLK_Dependency_Table {
>>          UCHAR ucRevId;
>>          UCHAR ucNumEntries;                                                     /* Number of entries. */
>> -       ATOM_Polaris_SCLK_Dependency_Record entries[1];                          /* Dynamically allocate entries. */
>> +       ATOM_Polaris_SCLK_Dependency_Record entries[];                           /* Dynamically allocate entries. */
>>   } ATOM_Polaris_SCLK_Dependency_Table;
>>
>>   typedef struct _ATOM_Tonga_PCIE_Record {
>> @@ -222,7 +222,7 @@ typedef struct _ATOM_Tonga_PCIE_Record {
>>   typedef struct _ATOM_Tonga_PCIE_Table {
>>          UCHAR ucRevId;
>>          UCHAR ucNumEntries;                                                                             /* Number of entries. */
>> -       ATOM_Tonga_PCIE_Record entries[1];                                                      /* Dynamically allocate entries. */
>> +       ATOM_Tonga_PCIE_Record entries[];                                                       /* Dynamically allocate entries. */
>>   } ATOM_Tonga_PCIE_Table;
>>
>>   typedef struct _ATOM_Polaris10_PCIE_Record {
>> @@ -235,7 +235,7 @@ typedef struct _ATOM_Polaris10_PCIE_Record {
>>   typedef struct _ATOM_Polaris10_PCIE_Table {
>>          UCHAR ucRevId;
>>          UCHAR ucNumEntries;                                         /* Number of entries. */
>> -       ATOM_Polaris10_PCIE_Record entries[1];                      /* Dynamically allocate entries. */
>> +       ATOM_Polaris10_PCIE_Record entries[];                      /* Dynamically allocate entries. */
>>   } ATOM_Polaris10_PCIE_Table;
>>
>>
>> @@ -252,7 +252,7 @@ typedef struct _ATOM_Tonga_MM_Dependency_Record {
>>   typedef struct _ATOM_Tonga_MM_Dependency_Table {
>>          UCHAR ucRevId;
>>          UCHAR ucNumEntries;                                                                             /* Number of entries. */
>> -       ATOM_Tonga_MM_Dependency_Record entries[1];                        /* Dynamically allocate entries. */
>> +       ATOM_Tonga_MM_Dependency_Record entries[];                         /* Dynamically allocate entries. */
>>   } ATOM_Tonga_MM_Dependency_Table;
>>
>>   typedef struct _ATOM_Tonga_Voltage_Lookup_Record {
>> @@ -265,7 +265,7 @@ typedef struct _ATOM_Tonga_Voltage_Lookup_Record {
>>   typedef struct _ATOM_Tonga_Voltage_Lookup_Table {
>>          UCHAR ucRevId;
>>          UCHAR ucNumEntries;                                                                             /* Number of entries. */
>> -       ATOM_Tonga_Voltage_Lookup_Record entries[1];                            /* Dynamically allocate entries. */
>> +       ATOM_Tonga_Voltage_Lookup_Record entries[];                             /* Dynamically allocate entries. */
>>   } ATOM_Tonga_Voltage_Lookup_Table;
>>
>>   typedef struct _ATOM_Tonga_Fan_Table {
>> --
>> 2.34.1
>>



More information about the amd-gfx mailing list