]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
drm/amdgpu: Prevent shift wrapping in amdgpu_read_mask()
authorDan Carpenter <dan.carpenter@oracle.com>
Tue, 2 Feb 2021 05:56:36 +0000 (08:56 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 4 Mar 2021 08:39:41 +0000 (09:39 +0100)
[ Upstream commit c915ef890d5dc79f483e1ca3b3a5b5f1a170690c ]

If the user passes a "level" value which is higher than 31 then that
leads to shift wrapping.  The undefined behavior will lead to a
syzkaller stack dump.

Fixes: 5632708f4452 ("drm/amd/powerplay: add dpm force multiple levels on cz/tonga/fiji/polaris (v2)")
Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c

index e63a253eb42550e548df03c6d819d27bfe191d03..cbb969a870f6a0f42504bcfbee45f70f25b97d08 100644 (file)
@@ -617,7 +617,7 @@ static ssize_t amdgpu_get_pp_dpm_sclk(struct device *dev,
 static ssize_t amdgpu_read_mask(const char *buf, size_t count, uint32_t *mask)
 {
        int ret;
-       long level;
+       unsigned long level;
        char *sub_str = NULL;
        char *tmp;
        char buf_cpy[AMDGPU_MASK_BUF_MAX + 1];
@@ -633,8 +633,8 @@ static ssize_t amdgpu_read_mask(const char *buf, size_t count, uint32_t *mask)
        while (tmp[0]) {
                sub_str = strsep(&tmp, delimiter);
                if (strlen(sub_str)) {
-                       ret = kstrtol(sub_str, 0, &level);
-                       if (ret)
+                       ret = kstrtoul(sub_str, 0, &level);
+                       if (ret || level > 31)
                                return -EINVAL;
                        *mask |= 1 << level;
                } else