[PATCH] Revert "drm/amdgpu: Fix NULL dereference in dpm sysfs handlers" - Linux-stable-mirror

14 Oct 2020

This regressed some working configurations so revert it.  Will
fix this properly for 5.9 and backport then.
This reverts commit 38e0c89a19fd13f28d2b4721035160a3e66e270b.
This needs to be applied to 5.9 as well.  -next (5.10) has this
already, but 5.9 missed it.
Bug: https://gitlab.freedesktop.org/drm/amd/-/issues/1334
Signed-off-by: Alex Deucher alexander.deucher@amd.com
Cc: stable@vger.kernel.org # 5.9.x
(cherry picked from commit 87004abfbc27261edd15716515d89ab42198b405)
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index e4dbf14320b6..5bf4212d2857 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -796,7 +796,8 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev,
    	tmp_str++;
    while (isspace(*++tmp_str));
-	while ((sub_str = strsep(&tmp_str, delimiter)) != NULL) {
+	while (tmp_str[0]) {
+		sub_str = strsep(&tmp_str, delimiter);
    	ret = kstrtol(sub_str, 0, &parameter[parameter_size]);
    	if (ret)
    		return -EINVAL;
@@ -1066,7 +1067,8 @@ static ssize_t amdgpu_read_mask(const char *buf, size_t count, uint32_t *mask)
    memcpy(buf_cpy, buf, bytes);
    buf_cpy[bytes] = '\0';
    tmp = buf_cpy;
-	while ((sub_str = strsep(&tmp, delimiter)) != NULL) {
+	while (tmp[0]) {
+		sub_str = strsep(&tmp, delimiter);
    	if (strlen(sub_str)) {
    		ret = kstrtol(sub_str, 0, &level);
    		if (ret)
@@ -1695,7 +1697,8 @@ static ssize_t amdgpu_set_pp_power_profile_mode(struct device *dev,
    		i++;
    	memcpy(buf_cpy, buf, count-i);
    	tmp_str = buf_cpy;
-		while ((sub_str = strsep(&tmp_str, delimiter)) != NULL) {
+		while (tmp_str[0]) {
+			sub_str = strsep(&tmp_str, delimiter);
    		ret = kstrtol(sub_str, 0, &parameter[parameter_size]);
    		if (ret)
    			return -EINVAL;
-- 
2.25.4


    