]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/amd/powerplay: fix potential issue of array access violation
authorRex Zhu <Rex.Zhu@amd.com>
Wed, 14 Sep 2016 11:24:25 +0000 (19:24 +0800)
committerAlex Deucher <alexander.deucher@amd.com>
Mon, 19 Sep 2016 17:22:08 +0000 (13:22 -0400)
Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/powerplay/hwmgr/hwmgr.c

index 524d0dd4f0e9fd13bc0976977d2980facb847b49..4f82a06ba3e2f834c937f0e5778bda2b05859923 100644 (file)
@@ -388,12 +388,9 @@ int phm_reset_single_dpm_table(void *table,
 
        struct vi_dpm_table *dpm_table = (struct vi_dpm_table *)table;
 
-       PP_ASSERT_WITH_CODE(count <= max,
-                       "Fatal error, can not set up single DPM table entries to exceed max number!",
-                          );
+       dpm_table->count = count > max ? max : count;
 
-       dpm_table->count = count;
-       for (i = 0; i < max; i++)
+       for (i = 0; i < dpm_table->count; i++)
                dpm_table->dpm_level[i].enabled = false;
 
        return 0;