[PATCH] drm/amdgpu: Fail when setting negative DPM levels v2

Kent Russell kent.russell at amd.com
Fri Mar 2 17:53:07 UTC 2018


kstrtol can handle negative values, which is unchecked here. While
setting a negative value will result in the mask being 1<<0xffffffff ,
which the SMU will ignore because it's out of long bits, return an
error instead of silently failing.

v2 Add similar check for sclk_od and mclk_od

Signed-off-by: Kent Russell <kent.russell at amd.com>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index 9e73cbc..5bdb421 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -476,7 +476,7 @@ static ssize_t amdgpu_set_pp_dpm_sclk(struct device *dev,
 		sub_str[1] = '\0';
 		ret = kstrtol(sub_str, 0, &level);
 
-		if (ret) {
+		if (ret || level < 0) {
 			count = -EINVAL;
 			goto fail;
 		}
@@ -522,7 +522,7 @@ static ssize_t amdgpu_set_pp_dpm_mclk(struct device *dev,
 		sub_str[1] = '\0';
 		ret = kstrtol(sub_str, 0, &level);
 
-		if (ret) {
+		if (ret || level < 0) {
 			count = -EINVAL;
 			goto fail;
 		}
@@ -567,7 +567,7 @@ static ssize_t amdgpu_set_pp_dpm_pcie(struct device *dev,
 		sub_str[1] = '\0';
 		ret = kstrtol(sub_str, 0, &level);
 
-		if (ret) {
+		if (ret || level < 0) {
 			count = -EINVAL;
 			goto fail;
 		}
@@ -606,7 +606,7 @@ static ssize_t amdgpu_set_pp_sclk_od(struct device *dev,
 
 	ret = kstrtol(buf, 0, &value);
 
-	if (ret) {
+	if (ret || value < 0) {
 		count = -EINVAL;
 		goto fail;
 	}
@@ -650,7 +650,7 @@ static ssize_t amdgpu_set_pp_mclk_od(struct device *dev,
 
 	ret = kstrtol(buf, 0, &value);
 
-	if (ret) {
+	if (ret || value < 0) {
 		count = -EINVAL;
 		goto fail;
 	}
-- 
2.7.4



More information about the amd-gfx mailing list