leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

drm/amdgpu: Prevent shift wrapping in amdgpu_read_mask()

Browse Source 
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: 5632708f44 ("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>
This commit is contained in:
Dan Carpenter
2021-02-02 08:56:36 +03:00
committed by Alex Deucher
parent 4b1d6831b3
commit c915ef890d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/gpu/drm/amd/pm/amdgpu_pm.c
View File

@@ -1095,7 +1095,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) static ssize_t amdgpu_read_mask(const char *buf, size_t count, uint32_t *mask)
{ {
int ret; int ret;
long level; unsigned long level;
char *sub_str = NULL; char *sub_str = NULL;
char *tmp; char *tmp;
char buf_cpy[AMDGPU_MASK_BUF_MAX + 1]; char buf_cpy[AMDGPU_MASK_BUF_MAX + 1];
@@ -1110,8 +1110,8 @@ static ssize_t amdgpu_read_mask(const char *buf, size_t count, uint32_t *mask)
tmp = buf_cpy; tmp = buf_cpy;
while ((sub_str = strsep(&tmp, delimiter)) != NULL) { while ((sub_str = strsep(&tmp, delimiter)) != NULL) {
if (strlen(sub_str)) { if (strlen(sub_str)) {
ret = kstrtol(sub_str, 0, &level); ret = kstrtoul(sub_str, 0, &level);
if (ret) if (ret || level > 31)
return -EINVAL; return -EINVAL;
*mask |= 1 << level; *mask |= 1 << level;
} else } else