drm/radeon: silence UBSAN warning (v3)
Subsystems (2)
Alex Deucher
maintainerPATCH 1/1 drm/radeon: silence UBSAN warning (v3)
Convert a variable sized array from [1] to [].
v2: fix up a few more.
v3: integrate comments from Kees.
Tested-by Jeff Johnson <[email protected]>
Signed-off-by Alex Deucher <[email protected]>
--- drivers/gpu/drm/radeon/pptable.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
drivers/gpu/drm/radeon/pptable.h +5 -5
@@ -424,7 +424,7 @@ typedef struct _ATOM_PPLIB_SUMO_CLOCK_INFO{ typedef struct _ATOM_PPLIB_STATE_V2 { //number of valid dpm levels in this state; Driver uses it to calculate the whole - //size of the state: sizeof(ATOM_PPLIB_STATE_V2) + (ucNumDPMLevels - 1) * sizeof(UCHAR) + //size of the state: struct_size(ATOM_PPLIB_STATE_V2, clockInfoIndex, ucNumDPMLevels) UCHAR ucNumDPMLevels; //a index to the array of nonClockInfos
@@ -432,14 +432,14 @@ typedef struct _ATOM_PPLIB_STATE_V2/** * Driver will read the first ucNumDPMLevels in this array */ -UCHAR clockInfoIndex[1 ]; + UCHAR clockInfoIndex[] __counted_by(ucNumDPMLevels); }ATOM_PPLIB_STATE_V2 ;typedef struct _StateArray {//how many states we have UCHAR ucNumEntries; -ATOM_PPLIB_STATE_V2 states[1 ]; + ATOM_PPLIB_STATE_V2 states[] __counted_by(ucNumEntries); }StateArray ;
@@ -450,7 +450,7 @@ typedef struct _ClockInfoArray{//sizeof(ATOM_PPLIB_CLOCK_INFO) UCHAR ucEntrySize; -UCHAR clockInfo[1 ]; + UCHAR clockInfo[] __counted_by(ucNumEntries); }ClockInfoArray; typedef struct _NonClockInfoArray{
@@ -460,7 +460,7 @@ typedef struct _NonClockInfoArray{//sizeof(ATOM_PPLIB_NONCLOCK_INFO) UCHAR ucEntrySize; -ATOM_PPLIB_NONCLOCK_INFO nonClockInfo[1 ]; + ATOM_PPLIB_NONCLOCK_INFO nonClockInfo[] __counted_by(ucNumEntries); }NonClockInfoArray; typedef struct _ATOM_PPLIB_Clock_Voltage_Dependency_Record
Signature · 1 line
2.44.0
Quoted 8 lines · Alex Deucher
Convert a variable sized array from [1] to [].
v2: fix up a few more.
v3: integrate comments from Kees.Tested-by Jeff Johnson <[email protected]>Signed-off-by Alex Deucher <[email protected]>
LGTM! :)
Reviewed-by Kees Cook <[email protected]>
Signature · 1 line
Kees Cook