64 lines
2.8 KiB
Diff
64 lines
2.8 KiB
Diff
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Mario Limonciello <mario.limonciello@amd.com>
|
||
|
|
Date: Wed, 4 Oct 2023 15:22:52 -0500
|
||
|
|
Subject: [PATCH] drm/amd: Fix UBSAN array-index-out-of-bounds for SMU7
|
||
|
|
|
||
|
|
For pptable structs that use flexible array sizes, use flexible arrays.
|
||
|
|
|
||
|
|
Suggested-by: Felix Held <felix.held@amd.com>
|
||
|
|
Link: https://gitlab.freedesktop.org/drm/amd/-/issues/2874
|
||
|
|
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 760efbca74a405dc439a013a5efaa9fadc95a8c3)
|
||
|
|
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>
|
||
|
|
---
|
||
|
|
drivers/gpu/drm/amd/include/pptable.h | 4 ++--
|
||
|
|
drivers/gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h | 4 ++--
|
||
|
|
2 files changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/drivers/gpu/drm/amd/include/pptable.h b/drivers/gpu/drm/amd/include/pptable.h
|
||
|
|
index 0b6a057e0a4c..5aac8d545bdc 100644
|
||
|
|
--- a/drivers/gpu/drm/amd/include/pptable.h
|
||
|
|
+++ b/drivers/gpu/drm/amd/include/pptable.h
|
||
|
|
@@ -78,7 +78,7 @@ typedef struct _ATOM_PPLIB_THERMALCONTROLLER
|
||
|
|
typedef struct _ATOM_PPLIB_STATE
|
||
|
|
{
|
||
|
|
UCHAR ucNonClockStateIndex;
|
||
|
|
- UCHAR ucClockStateIndices[1]; // variable-sized
|
||
|
|
+ UCHAR ucClockStateIndices[]; // variable-sized
|
||
|
|
} ATOM_PPLIB_STATE;
|
||
|
|
|
||
|
|
|
||
|
|
@@ -473,7 +473,7 @@ typedef struct _ATOM_PPLIB_STATE_V2
|
||
|
|
/**
|
||
|
|
* Driver will read the first ucNumDPMLevels in this array
|
||
|
|
*/
|
||
|
|
- UCHAR clockInfoIndex[1];
|
||
|
|
+ UCHAR clockInfoIndex[];
|
||
|
|
} ATOM_PPLIB_STATE_V2;
|
||
|
|
|
||
|
|
typedef struct _StateArray{
|
||
|
|
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 b0ac4d121adc..41444e27bfc0 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
|
||
|
|
@@ -179,7 +179,7 @@ typedef struct _ATOM_Tonga_MCLK_Dependency_Record {
|
||
|
|
typedef struct _ATOM_Tonga_MCLK_Dependency_Table {
|
||
|
|
UCHAR ucRevId;
|
||
|
|
UCHAR ucNumEntries; /* Number of entries. */
|
||
|
|
- ATOM_Tonga_MCLK_Dependency_Record entries[1]; /* Dynamically allocate entries. */
|
||
|
|
+ ATOM_Tonga_MCLK_Dependency_Record entries[]; /* Dynamically allocate entries. */
|
||
|
|
} ATOM_Tonga_MCLK_Dependency_Table;
|
||
|
|
|
||
|
|
typedef struct _ATOM_Tonga_SCLK_Dependency_Record {
|
||
|
|
@@ -194,7 +194,7 @@ typedef struct _ATOM_Tonga_SCLK_Dependency_Record {
|
||
|
|
typedef struct _ATOM_Tonga_SCLK_Dependency_Table {
|
||
|
|
UCHAR ucRevId;
|
||
|
|
UCHAR ucNumEntries; /* Number of entries. */
|
||
|
|
- ATOM_Tonga_SCLK_Dependency_Record entries[1]; /* Dynamically allocate entries. */
|
||
|
|
+ ATOM_Tonga_SCLK_Dependency_Record entries[]; /* Dynamically allocate entries. */
|
||
|
|
} ATOM_Tonga_SCLK_Dependency_Table;
|
||
|
|
|
||
|
|
typedef struct _ATOM_Polaris_SCLK_Dependency_Record {
|