Commit cf93f101 authored by Jesse Zhang's avatar Jesse Zhang Committed by Alex Deucher
Browse files

drm/amd/amdgpu: Fix out of bounds warning in amdgpu_hw_ip_info 



Fix an array index out of bounds warning in the DMA IP case of
amdgpu_hw_ip_info() where it was incorrectly checking
adev->gfx.gfx_ring[i].no_user_submission instead of
adev->sdma.instance[i].ring.no_user_submission.

The mismatch caused UBSAN to report an array bounds violation since
it was accessing the GFX ring array with SDMA instance indices.

Fixes: 4310acd4 ("drm/amdgpu: add ring flag for no user submissions")
Reviewed-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Signed-off-by: default avatarJesse Zhang <jesse.zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 4172b556

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

+1 −1
Original line number Diff line number Diff line
@@ -427,7 +427,7 @@ static int amdgpu_hw_ip_info(struct amdgpu_device *adev, 
		type = AMD_IP_BLOCK_TYPE_SDMA;

		for (i = 0; i < adev->sdma.num_instances; i++)

			if (adev->sdma.instance[i].ring.sched.ready &&

			    !adev->gfx.gfx_ring[i].no_user_submission)

			    !adev->sdma.instance[i].ring.no_user_submission)

				++num_rings;

		ib_start_alignment = 256;

		ib_size_alignment = 4;