Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d50a5674 authored by Mario Limonciello's avatar Mario Limonciello Committed by Greg Kroah-Hartman
Browse files

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

[ Upstream commit 0f0e59075b5c22f1e871fbd508d6e4f495048356 ]

For pptable structs that use flexible array sizes, use flexible arrays.

Link: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/2036742


Signed-off-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Acked-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent c847379a

drivers/gpu/drm/amd/powerplay/hwmgr/pptable_v1_0.h

+6 −6
Original line number Diff line number Diff line
@@ -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 {