Skip to content

Commit a7a411e

Browse files
Jie1zhangalexdeucher
authored andcommitted
drm/amdgpu: fix shift-out-of-bounds in amdgpu_debugfs_jpeg_sched_mask_set
Fix a UBSAN shift-out-of-bounds warning in amdgpu_debugfs_jpeg_sched_mask_set when the shift exponent reaches or exceeds 32 bits. The issue occurred because a 32-bit integer '1' was being shifted by up to 32 bits, which is undefined behavior. Replace '1' with '1ULL' to ensure 64-bit arithmetic, matching the u64 type of 'val' and preventing the shift overflow. This is consistent with the existing mask calculation that already uses 1ULL. The error manifested as: UBSAN: shift-out-of-bounds in drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c:373:17 shift exponent 32 is too large for 32-bit type 'int' v2: remove debug log Reviewed-by: Lijo Lazar <lijo.lazar@amd.com> Suggested-by: Lijo Lazar <lijo.lazar@amd.com> Signed-off-by: Jesse Zhang <Jesse.Zhang@amd.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
1 parent 268da6f commit a7a411e

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -370,7 +370,7 @@ static int amdgpu_debugfs_jpeg_sched_mask_set(void *data, u64 val)
370370
for (i = 0; i < adev->jpeg.num_jpeg_inst; ++i) {
371371
for (j = 0; j < adev->jpeg.num_jpeg_rings; ++j) {
372372
ring = &adev->jpeg.inst[i].ring_dec[j];
373-
if (val & (1 << ((i * adev->jpeg.num_jpeg_rings) + j)))
373+
if (val & (BIT_ULL(1) << ((i * adev->jpeg.num_jpeg_rings) + j)))
374374
ring->sched.ready = true;
375375
else
376376
ring->sched.ready = false;

0 commit comments

Comments
 (0)