drm/amdgpu: fix overflowed array index read warning
Subsystems (2)
PATCH 1/1 drm/amdgpu: fix overflowed array index read warning
From: Tim Huang <[email protected]>
Clear warning that cast operation might have overflowed.
--- 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,7 +473,7 @@ 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; +int r;uint32_t value, result, early[3 ];if (*pos &3 || size &3 )
@@ -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
Christian König
maintainerAm 25.04.24 um 07:27 schrieb Tim Huang:
Quoted 14 lines
From: Tim Huang <[email protected]>
Clear warning that cast operation might have overflowed.
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 +0
-0
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c static ssize_t amdgpu_debugfs_ring_read(struct file *f, char __user *buf, · line 477
Quoted 6 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +1
-1@@ -473,7 +473,7 @@ 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; +int r;uint32_t value, result, early[3 ];
While at it please declare "int r;" last, e.g. keep reverse xmas tree order here.
Apart from that looks good to me.
Regards,
Christian.
Quoted 11 lines
drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +1
-1if (*pos &3 || size &3 )@@ -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;
[AMD Official Use Only - General]
-----Original Message-----
From: Koenig, Christian <[email protected]>
Sent: Thursday, April 25, 2024 2:45 PM
To: Huang, Tim <[email protected]>; [email protected]
Cc: Deucher, Alexander <[email protected]>
Subject: Re: [PATCH] drm/amdgpu: fix overflowed array index read warning
Am 25.04.24 um 07:27 schrieb Tim Huang:
Quoted 22 lines
From: Tim Huang <[email protected]>
Clear warning that cast operation might have overflowed.
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,7 +473,7 @@ 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; +int r;uint32_t value, result, early[3 ];
Quoted 1 line
While at it please declare "int r;" last, e.g. keep reverse xmas tree order here.
Yes, it is better. Will adjust the order and send out v2, thanks.
Tim.
Quoted 16 lines
Apart from that looks good to me.
Regards,
Christian.if (*pos & 3 || size & 3)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++) { r =put_user (early[i], (uint32_t *)buf);if (r)return r;