Attachment 127977 Details for Bug 97403 – fix patch

[patch] fix patch

0001-drm-amd-powerplay-avoid-out-of-bounds-access-on-arra.patch (text/plain), 1.73 KB, created by rezhu on 2016-11-15 09:09:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: rezhu

Created: 2016-11-15 09:09:35 UTC

Size: 1.73 KB

patch

obsolete

>From 8c0e2d689e076e69b438a785b25cd6f603e4011a Mon Sep 17 00:00:00 2001
>From: Rex Zhu <Rex.Zhu@amd.com>
>Date: Mon, 14 Nov 2016 16:36:08 +0800
>Subject: [PATCH] drm/amd/powerplay: avoid out of bounds access on array ps.
>
>check array index first and then visit the array.
>
>Change-Id: If0c10e178fd4e4c101a733689e9a1984aaacfe3c
>Signed-off-by: Rex Zhu <Rex.Zhu@amd.com>
>---
> drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
>diff --git a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>index b1c7751..6091b48 100644
>--- a/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>+++ b/drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c
>@@ -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
>

Actions: View | Splinter Review

Attachments on bug 97403: 127964 | 127977

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.