Commit 9f0bcf49 authored by Chia-I Wu's avatar Chia-I Wu Committed by Alex Deucher
Browse files

amdgpu: validate offset_in_bo of drm_amdgpu_gem_va 



This is motivated by OOB access in amdgpu_vm_update_range when
offset_in_bo+map_size overflows.

v2: keep the validations in amdgpu_vm_bo_map
v3: add the validations to amdgpu_vm_bo_map/amdgpu_vm_bo_replace_map
    rather than to amdgpu_gem_va_ioctl

Fixes: 9f7eb536 ("drm/amdgpu: actually use the VM map parameters")
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarChia-I Wu <olvaffe@gmail.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 9bd443cb

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

+8 −8
Original line number Diff line number Diff line
@@ -1434,14 +1434,14 @@ int amdgpu_vm_bo_map(struct amdgpu_device *adev, 
	uint64_t eaddr;



	/* validate the parameters */

	if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK ||

	    size == 0 || size & ~PAGE_MASK)

	if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MASK)

		return -EINVAL;

	if (saddr + size <= saddr || offset + size <= offset)

		return -EINVAL;



	/* make sure object fit at this offset */

	eaddr = saddr + size - 1;

	if (saddr >= eaddr ||

	    (bo && offset + size > amdgpu_bo_size(bo)) ||

	if ((bo && offset + size > amdgpu_bo_size(bo)) ||

	    (eaddr >= adev->vm_manager.max_pfn << AMDGPU_GPU_PAGE_SHIFT))

		return -EINVAL;
@@ -1500,14 +1500,14 @@ int amdgpu_vm_bo_replace_map(struct amdgpu_device *adev, 
	int r;



	/* validate the parameters */

	if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK ||

	    size == 0 || size & ~PAGE_MASK)

	if (saddr & ~PAGE_MASK || offset & ~PAGE_MASK || size & ~PAGE_MASK)

		return -EINVAL;

	if (saddr + size <= saddr || offset + size <= offset)

		return -EINVAL;



	/* make sure object fit at this offset */

	eaddr = saddr + size - 1;

	if (saddr >= eaddr ||

	    (bo && offset + size > amdgpu_bo_size(bo)) ||

	if ((bo && offset + size > amdgpu_bo_size(bo)) ||

	    (eaddr >= adev->vm_manager.max_pfn << AMDGPU_GPU_PAGE_SHIFT))

		return -EINVAL;