diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-17 14:51:38 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2020-08-17 14:51:38 -0400 |
| commit | b08cb5ed16e7d92e91b3309d05614e73199aa978 (patch) | |
| tree | c082710f448897c46ffb0fdfe782892dfd812a05 | |
| parent | b915ce6a063f8f34e3e6d1b426f3049220b8e402 (diff) | |
| download | longterm-queue-5.2-b08cb5ed16e7d92e91b3309d05614e73199aa978.tar.gz | |
drm: amd: ctxt refresh
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/drm-amdgpu-Fix-NULL-dereference-in-dpm-sysfs-handler.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/queue/drm-amdgpu-Fix-NULL-dereference-in-dpm-sysfs-handler.patch b/queue/drm-amdgpu-Fix-NULL-dereference-in-dpm-sysfs-handler.patch index 766ceb2b..2482b21b 100644 --- a/queue/drm-amdgpu-Fix-NULL-dereference-in-dpm-sysfs-handler.patch +++ b/queue/drm-amdgpu-Fix-NULL-dereference-in-dpm-sysfs-handler.patch @@ -1,4 +1,4 @@ -From 38e0c89a19fd13f28d2b4721035160a3e66e270b Mon Sep 17 00:00:00 2001 +From 3d1724b5c0a1b5ea6180392d44ec6808d606e2f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= <me@woland.xyz> Date: Sun, 19 Jul 2020 17:54:53 +0200 Subject: [PATCH] drm/amdgpu: Fix NULL dereference in dpm sysfs handlers @@ -21,10 +21,10 @@ Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Cc: stable@vger.kernel.org diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c -index 02e6f8c4dde0..ebb8a28ff002 100644 +index 059f99534d77..557e8deadc9c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c -@@ -778,8 +778,7 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev, +@@ -681,8 +681,7 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev, tmp_str++; while (isspace(*++tmp_str)); @@ -34,7 +34,7 @@ index 02e6f8c4dde0..ebb8a28ff002 100644 ret = kstrtol(sub_str, 0, ¶meter[parameter_size]); if (ret) return -EINVAL; -@@ -1039,8 +1038,7 @@ static ssize_t amdgpu_read_mask(const char *buf, size_t count, uint32_t *mask) +@@ -867,8 +866,7 @@ 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; @@ -44,7 +44,7 @@ index 02e6f8c4dde0..ebb8a28ff002 100644 if (strlen(sub_str)) { ret = kstrtol(sub_str, 0, &level); if (ret) -@@ -1637,8 +1635,7 @@ static ssize_t amdgpu_set_pp_power_profile_mode(struct device *dev, +@@ -1274,8 +1272,7 @@ static ssize_t amdgpu_set_pp_power_profile_mode(struct device *dev, i++; memcpy(buf_cpy, buf, count-i); tmp_str = buf_cpy; @@ -52,8 +52,8 @@ index 02e6f8c4dde0..ebb8a28ff002 100644 - sub_str = strsep(&tmp_str, delimiter); + while ((sub_str = strsep(&tmp_str, delimiter)) != NULL) { ret = kstrtol(sub_str, 0, ¶meter[parameter_size]); - if (ret) - return -EINVAL; + if (ret) { + count = -EINVAL; -- 2.27.0 |