Unverified Commit 5dac66de authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8066 drm/amd: Fix UBSAN array-index-out-of-bounds for SMU7 

Merge Pull Request from: @ci-robot 
 
PR sync from: Ye Bin <yebin10@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/UCRTIK7N6X7OQAU5OKOTRAT4DTHKPMIM/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9RFET 
 
Link:https://gitee.com/openeuler/kernel/pulls/8066

 

Reviewed-by: default avatarLiu YongQiang <liuyongqiang13@huawei.com>
Signed-off-by: default avatarZhang Changzhong <zhangchangzhong@huawei.com>
parents 0ba213c2 48dbe0ca

drivers/gpu/drm/amd/include/pptable.h

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

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

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