drm/amdgpu: Fix realloc of ptr
Subsystems (2)
PATCH v2 1/1 drm/amdgpu: Fix realloc of ptr
From: Tom Rix <[email protected]>
Clang static analysis reports this error amdgpu_debugfs.c:1690:9: warning: 1st function call
argument is an uninitialized value
tmp = krealloc_array(tmp, i + 1,
^~~~~~~~~~~~~~~~~~~~~~~~~~~
realloc uses tmp, so tmp can not be garbage.
And the return needs to be checked.
---
v2:
use 'new' to hold/check the ralloc return
fix commit log mistake on ralloc freeing to using input ptr
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +7 -2
@@ -1676,7 +1676,7 @@ static ssize_t amdgpu_reset_dump_register_list_write(struct file *f, {struct amdgpu_device *adev = (struct amdgpu_device *)file_inode (f)->i_private;char reg_offset[11 ]; -uint32_t *tmp; +uint32_t *new, *tmp =NULL ;int ret, i =0 , len =0 ; do {
@@ -1687,7 +1687,12 @@ static ssize_t amdgpu_reset_dump_register_list_write(struct file *f, goto error_free; } - tmp =krealloc_array (tmp, i +1 ,sizeof (uint32_t ),GFP_KERNEL ); + new =krealloc_array (tmp, i +1 ,sizeof (uint32_t ),GFP_KERNEL ); +if (!new) { + ret = -ENOMEM ; + goto error_free; + } + tmp = new;if (sscanf (reg_offset,"%X %n" , &tmp[i], &ret) !=1 ) { ret = -EINVAL ; goto error_free;
Signature · 1 line
2.26.3
Am 27.02.22 um 16:33 schrieb [email protected]:
Quoted 6 lines
From: Tom Rix <[email protected]>
Clang static analysis reports this error amdgpu_debugfs.c:1690:9: warning: 1st function call
argument is an uninitialized value
tmp = krealloc_array(tmp, i + 1,
Quoted 7 lines
^~~~~~~~~~~~~~~~~~~~~~~~~~~realloc uses tmp, so tmp can not be garbage.
And the return needs to be checked.Fixes 5ce5a584cb82 ("drm/amdgpu: add debugfs for reset registers list")Signed-off-by Tom Rix <[email protected]>
Yeah, stuff I missed because of the long review. I was already wondering what semantics krealloc_array is following for freeing up the pointer on error.
Thanks,
Christian.
Quoted 35 lines
---
v2:
use 'new' to hold/check the ralloc return
fix commit log mistake on ralloc freeing to using input ptrdrivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +7
-2@@ -1676,7 +1676,7 @@ static ssize_t amdgpu_reset_dump_register_list_write(struct file *f, {struct amdgpu_device *adev = (struct amdgpu_device *)file_inode (f)->i_private;char reg_offset[11 ]; -uint32_t *tmp; +uint32_t *new, *tmp =NULL ;int ret, i =0 , len =0 ; do {@@ -1687,7 +1687,12 @@ static ssize_t amdgpu_reset_dump_register_list_write(struct file *f, goto error_free; } - tmp =krealloc_array (tmp, i +1 ,sizeof (uint32_t ),GFP_KERNEL ); + new =krealloc_array (tmp, i +1 ,sizeof (uint32_t ),GFP_KERNEL ); +if (!new) { + ret = -ENOMEM ; + goto error_free; + } + tmp = new;if (sscanf (reg_offset,"%X %n" , &tmp[i], &ret) !=1 ) { ret = -EINVAL ; goto error_free;
Alex Deucher
AppliedApplied. Thanks!
Alex
Quoted 61 lines · Christian König
Am 27.02.22 um 16:33 schrieb [email protected]:
Quoted 6 lines
From: Tom Rix <[email protected]>
Clang static analysis reports this error amdgpu_debugfs.c:1690:9: warning: 1st function call
argument is an uninitialized value
tmp = krealloc_array(tmp, i + 1,Quoted 7 lines
^~~~~~~~~~~~~~~~~~~~~~~~~~~realloc uses tmp, so tmp can not be garbage.
And the return needs to be checked.Fixes 5ce5a584cb82 ("drm/amdgpu: add debugfs for reset registers list")Signed-off-by Tom Rix <[email protected]>Yeah, stuff I missed because of the long review. I was already wondering what semantics
krealloc_arrayis following for freeing up the pointer on error.Reviewed-by Christian König <[email protected]>Thanks,
Christian.Quoted 35 lines
---
v2:
use 'new' to hold/check the ralloc return
fix commit log mistake on ralloc freeing to using input ptrdrivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +7
-2@@ -1676,7 +1676,7 @@ static ssize_t amdgpu_reset_dump_register_list_write(struct file *f, {struct amdgpu_device *adev = (struct amdgpu_device *)file_inode (f)->i_private;char reg_offset[11 ]; -uint32_t *tmp; +uint32_t *new, *tmp =NULL ;int ret, i =0 , len =0 ; do {@@ -1687,7 +1687,12 @@ static ssize_t amdgpu_reset_dump_register_list_write(struct file *f, goto error_free; } - tmp =krealloc_array (tmp, i +1 ,sizeof (uint32_t ),GFP_KERNEL ); + new =krealloc_array (tmp, i +1 ,sizeof (uint32_t ),GFP_KERNEL ); +if (!new) { + ret = -ENOMEM ; + goto error_free; + } + tmp = new;if (sscanf (reg_offset,"%X %n" , &tmp[i], &ret) !=1 ) { ret = -EINVAL ; goto error_free;