drm/amd/powerplay: avoid out of bounds access on array ps.
Subsystems (2)
PATCH 1/1 drm/amd/powerplay: avoid out of bounds access on array ps.
check array index first and then visit the array.
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +6 -6
@@ -2991,19 +2991,19 @@ static int smu7_get_pp_table_entry_callback_func_v0(struct pp_hwmgr *hwmgr,if (!(data->mc_micro_code_feature &DISABLE_MC_LOADMICROCODE ) && memory_clock > data->highest_mclk) data->highest_mclk = memory_clock; - performance_level = &(ps->performance_levels - [ps->performance_level_count++]); -PP_ASSERT_WITH_CODE ( (ps->performance_level_count <smum_get_mac_definition (hwmgr->smumgr,SMU_MAX_LEVELS_GRAPHICS )),"Performance levels exceeds SMC limit!" , return -EINVAL );PP_ASSERT_WITH_CODE ( - (ps->performance_level_count <= + (ps->performance_level_count < hwmgr->platform_descriptor.hardwareActivityPerformanceLevels), -"Performance levels exceeds Driver limit!" , - return -EINVAL ); +"Performance levels exceeds Driver limit, Skip!" , + return 0); + + performance_level = &(ps->performance_levels + [ps->performance_level_count++]);/* Performance levels are arranged from low to high. */ performance_level->memory_clock = memory_clock;
Signature · 6 lines
1.9.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1479193839-6142-1-git-send-email-Rex.Zhu-5C7GfCeVMHo@public.gmane.org
Christian König
Reviewed-byAm 15.11.2016 um 08:10 schrieb Rex Zhu:
Quoted 4 lines
check array index first and then visit the array.
Change-Id If0c10e178fd4e4c101a733689e9a1984aaacfe3cSigned-off-by Rex Zhu <[email protected]>
Quoted 24 lines
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +1
-4@@ -2991,19 +2991,19 @@ static int smu7_get_pp_table_entry_callback_func_v0(struct pp_hwmgr *hwmgr,if (!(data->mc_micro_code_feature &DISABLE_MC_LOADMICROCODE ) && memory_clock > data->highest_mclk) data->highest_mclk = memory_clock; - performance_level = &(ps->performance_levels - [ps->performance_level_count++]); -PP_ASSERT_WITH_CODE ( (ps->performance_level_count <smum_get_mac_definition (hwmgr->smumgr,SMU_MAX_LEVELS_GRAPHICS )),"Performance levels exceeds SMC limit!" , return -EINVAL ); PP_ASSERT_WITH_CODE( - (ps->performance_level_count <= + (ps->performance_level_count < hwmgr->platform_descriptor.hardwareActivityPerformanceLevels),
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c static int smu7_get_pp_table_entry_callback_func_v0(struct pp_hwmgr *hwmgr, · line 3009
Quoted 10 lines
drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +5
-2-"Performance levels exceeds Driver limit!" , - return -EINVAL); +"Performance levels exceeds Driver limit, Skip!" , + return 0); + + performance_level = &(ps->performance_levels + [ps->performance_level_count++]);/* Performance levels are arranged from low to high. */ performance_level->memory_clock = memory_clock;
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Deucher, Alexander
Reviewed-by Alex DeucherQuoted 9 lines
-----Original Message-----
From: amd-gfx [mailto:[email protected]] On Behalf Of Rex Zhu
Sent: Tuesday, November 15, 2016 2:11 AM
To: [email protected]
Cc: Zhu, Rex
Subject: [PATCH] drm/amd/powerplay: avoid out of bounds access on array ps.
Quoted 4 lines
check array index first and then visit the array.
Change-Id If0c10e178fd4e4c101a733689e9a1984aaacfe3cSigned-off-by Rex Zhu <[email protected]>
Quoted 43 lines
--- drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c +6
-7@@ -2991,19 +2991,19 @@ static int smu7_get_pp_table_entry_callback_func_v0(struct pp_hwmgr *hwmgr, if (!(data->mc_micro_code_feature & DISABLE_MC_LOADMICROCODE) && memory_clock > data->highest_mclk) data->highest_mclk = memory_clock; - performance_level = &(ps->performance_levels - [ps->performance_level_count++]); -PP_ASSERT_WITH_CODE ( (ps->performance_level_count <smum_get_mac_definition (hwmgr->smumgr,SMU_MAX_LEVELS_GRAPHICS )),"Performance levels exceeds SMC limit!" , return -EINVAL );PP_ASSERT_WITH_CODE ( - (ps->performance_level_count <= + (ps->performance_level_count < hwmgr- >platform_descriptor.hardwareActivityPerformanceLevels), -"Performance levels exceeds Driver limit!" , - return -EINVAL ); +"Performance levels exceeds Driver limit, Skip!" , + return 0); + + performance_level = &(ps->performance_levels + [ps->performance_level_count++]);/* Performance levels are arranged from low to high. */ performance_level->memory_clock = memory_clock; --1.9.1
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx