Skip to content

Commit 7ed9715

Browse files
Yang Wangalexdeucher
authored andcommitted
drm/amdgpu: fix UBSAN array-index-out-of-bounds for ras_block_string[]
fix array index out of bounds issue for ras_block_string[] array. Fixes: 30df05f ("drm/amdgpu: Align ras block enum with firmware") Signed-off-by: Yang Wang <kevinyang.wang@amd.com> Reviewed-by: Tao Zhou <tao.zhou1@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent b538734 commit 7ed9715

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,8 @@ const char *ras_block_string[] = {
7474
"mca",
7575
"vcn",
7676
"jpeg",
77+
"ih",
78+
"mpio",
7779
};
7880

7981
const char *ras_mca_block_string[] = {
@@ -95,7 +97,8 @@ const char *get_ras_block_str(struct ras_common_if *ras_block)
9597
if (!ras_block)
9698
return "NULL";
9799

98-
if (ras_block->block >= AMDGPU_RAS_BLOCK_COUNT)
100+
if (ras_block->block >= AMDGPU_RAS_BLOCK_COUNT ||
101+
ras_block->block >= ARRAY_SIZE(ras_block_string))
99102
return "OUT OF RANGE";
100103

101104
if (ras_block->block == AMDGPU_RAS_BLOCK__MCA)

0 commit comments

Comments
 (0)