drm/amd: Fix UBSAN array-index-out-of-bounds for Polaris and Tonga
authorjsg <jsg@openbsd.org>
Thu, 30 Nov 2023 02:30:10 +0000 (02:30 +0000)
committerjsg <jsg@openbsd.org>
Thu, 30 Nov 2023 02:30:10 +0000 (02:30 +0000)
From Mario Limonciello
d0725232da777840703f5f1e22f2e3081d712aa4 in linux-6.1.y/6.1.64
0f0e59075b5c22f1e871fbd508d6e4f495048356 in mainline linux

sys/dev/pci/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h

index 41444e2..e0e40b0 100644 (file)
@@ -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 {