drm/amdgpu: fix overflowed array index read warning
Subsystems (2)
PATCH v2 1/1 drm/amdgpu: fix overflowed array index read warning
From: Tim Huang <[email protected]>
Clear warning that cast operation might have overflowed.
v2: keep reverse xmas tree order to declare "int r;" (Christian)
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +2 -2
@@ -473,8 +473,8 @@ static ssize_t amdgpu_debugfs_ring_read(struct file *f, char __user *buf, size_t size, loff_t *pos) { struct amdgpu_ring *ring = file_inode(f)->i_private; -int r, i;uint32_t value, result, early[3 ]; +int r;if (*pos &3 || size &3 )return -EINVAL ;
@@ -485,7 +485,7 @@ static ssize_t amdgpu_debugfs_ring_read(struct file *f, char __user *buf, early[0 ] =amdgpu_ring_get_rptr (ring) & ring->buf_mask; early[1 ] =amdgpu_ring_get_wptr (ring) & ring->buf_mask; early[2 ] = ring->wptr & ring->buf_mask; -for (i = *pos /4 ; i <3 && size; i++) { +for (loff_t i = *pos /4 ; i <3 && size; i++) { r =put_user (early[i], (uint32_t *)buf);if (r)return r;
Signature · 1 line
2.39.2
Quoted 27 lines · Tim Huang
From: Tim Huang <[email protected]>
Clear warning that cast operation might have overflowed.
v2: keep reverse xmas tree order to declare "int r;" (Christian)
Signed-off-by Tim Huang <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +1
-1@@ -473,8 +473,8 @@ static ssize_t amdgpu_debugfs_ring_read(struct file *f, char __user *buf, size_t size, loff_t *pos) { struct amdgpu_ring *ring = file_inode(f)->i_private; -int r, i;uint32_t value, result, early[3 ]; +int r;if (*pos &3 || size &3 )return -EINVAL ;
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c static ssize_t amdgpu_debugfs_ring_read(struct file *f, char __user *buf, · line 488
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +1
-1@@ -485,7 +485,7 @@ static ssize_t amdgpu_debugfs_ring_read(struct file *f, char __user *buf, early[0 ] =amdgpu_ring_get_rptr (ring) & ring->buf_mask; early[1 ] =amdgpu_ring_get_wptr (ring) & ring->buf_mask; early[2 ] = ring->wptr & ring->buf_mask; -for (i = *pos /4 ; i <3 && size; i++) { +for (loff_t i = *pos /4 ; i <3 && size; i++) {
Some older compilers complain about declarations mixed with code like this. Not sure how big a deal that would be.
Alex
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +0
-1r =put_user (early[i], (uint32_t *)buf);if (r)return r; --2.39.2
Christian König
maintainerAm 25.04.24 um 15:28 schrieb Alex Deucher:
Quoted 24 lines · Tim Huang
Quoted 23 lines
From: Tim Huang <[email protected]>
Clear warning that cast operation might have overflowed.
v2: keep reverse xmas tree order to declare "int r;" (Christian)
Signed-off-by Tim Huang <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +1
-1@@ -473,8 +473,8 @@ static ssize_t amdgpu_debugfs_ring_read(struct file *f, char __user *buf, size_t size, loff_t *pos) { struct amdgpu_ring *ring = file_inode(f)->i_private; -int r, i;uint32_t value, result, early[3 ]; +int r;
Quoted 10 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c static ssize_t amdgpu_debugfs_ring_read(struct file *f, char __user *buf, · line 488
Quoted 8 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +1
-1if (*pos &3 || size &3 )return -EINVAL ;@@ -485,7 +485,7 @@ static ssize_t amdgpu_debugfs_ring_read(struct file *f, char __user *buf, early[0 ] =amdgpu_ring_get_rptr (ring) & ring->buf_mask; early[1 ] =amdgpu_ring_get_wptr (ring) & ring->buf_mask; early[2 ] = ring->wptr & ring->buf_mask; -for (i = *pos /4 ; i <3 && size; i++) { +for (loff_t i = *pos /4 ; i <3 && size; i++) {Some older compilers complain about declarations mixed with code like this. Not sure how big a deal that would be.
Good point, we would like to be able to backport this.
Somebody from Alivins team needs to comment, but IIRC we agreed that this would be legal and we take care of it by using appropriate compiler flags on older kernels.
Christian.
Quoted 9 lines
Alex
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +0
-1r =put_user (early[i], (uint32_t *)buf);if (r)return r; --2.39.2
[AMD Official Use Only - General]
-----Original Message-----
From: Koenig, Christian <[email protected]>
Sent: Thursday, April 25, 2024 9:31 PM
To: Alex Deucher <[email protected]>; Huang, Tim <[email protected]>
Cc: [email protected]; Deucher, Alexander <[email protected]>
Subject: Re: [PATCH v2] drm/amdgpu: fix overflowed array index read warning
Am 25.04.24 um 15:28 schrieb Alex Deucher:
Quoted 36 lines · Tim Huang
Quoted 27 lines
From: Tim Huang <[email protected]>
Clear warning that cast operation might have overflowed.
v2: keep reverse xmas tree order to declare "int r;" (Christian)
Signed-off-by Tim Huang <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +1
-1@@ -473,8 +473,8 @@ static ssize_t amdgpu_debugfs_ring_read(struct file *f, char __user *buf, size_t size, loff_t *pos) { struct amdgpu_ring *ring = file_inode(f)->i_private; -int r, i;uint32_t value, result, early[3 ]; +int r;if (*pos &3 || size &3 )return -EINVAL ;drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c static ssize_t amdgpu_debugfs_ring_read(struct file *f, char __user *buf, · line 488
Quoted 5 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +1
-1@@ -485,7 +485,7 @@ static ssize_t amdgpu_debugfs_ring_read(struct file *f, char __user *buf, early[0 ] =amdgpu_ring_get_rptr (ring) & ring->buf_mask; early[1 ] =amdgpu_ring_get_wptr (ring) & ring->buf_mask; early[2 ] = ring->wptr & ring->buf_mask; -for (i = *pos /4 ; i <3 && size; i++) { +for (loff_t i = *pos /4 ; i <3 && size; i++) {Some older compilers complain about declarations mixed with code like this. Not sure how big a deal that would be.
Quoted 5 lines
Good point, we would like to be able to backport this.
Somebody from Alivins team needs to comment, but IIRC we agreed that this would be legal and we take care of it by using appropriate compiler flags on older kernels.
Christian.
Thanks for pointing out. Will avoid doing this.
Quoted 9 lines
Alex
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +0
-1r =put_user (early[i], (uint32_t *)buf);if (r)return r; --2.39.2