77 lines
3.6 KiB
Diff
77 lines
3.6 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
From: Mario Limonciello <mario.limonciello@amd.com>
|
||
|
Date: Wed, 4 Oct 2023 15:46:44 -0500
|
||
|
Subject: [PATCH] drm/amd: Fix UBSAN array-index-out-of-bounds for Polaris and
|
||
|
Tonga
|
||
|
|
||
|
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@amd.com>
|
||
|
Acked-by: Alex Deucher <alexander.deucher@amd.com>
|
||
|
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
|
||
|
(cherry-picked from commit 0f0e59075b5c22f1e871fbd508d6e4f495048356)
|
||
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||
|
---
|
||
|
.../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 41444e27bfc0..e0e40b054c08 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 {
|