lkml.org 
[lkml]   [2023]   [Nov]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH AUTOSEL 5.15 09/20] drm/amd: Fix UBSAN array-index-out-of-bounds for SMU7
    Date
    From: Mario Limonciello <mario.limonciello@amd.com>

    [ Upstream commit 760efbca74a405dc439a013a5efaa9fadc95a8c3 ]

    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>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    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 0b6a057e0a4c4..5aac8d545bdc6 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 b0ac4d121adca..41444e27bfc0c 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 {
    --
    2.42.0
    \
     
     \ /
      Last update: 2023-11-20 13:51    [W:3.101 / U:0.956 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site