Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 82aace80 authored by Chia-I Wu's avatar Chia-I Wu Committed by Greg Kroah-Hartman
Browse files

amdgpu: validate offset_in_bo of drm_amdgpu_gem_va 



[ Upstream commit 9f0bcf49e9895cb005d78b33a5eebfa11711b425 ]

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>
Stable-dep-of: 6fef2d4c00b5 ("drm/amdgpu: validate the parameters of bo mapping operations more clearly")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 605134e3

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

+8 −8
Original line number Diff line number Diff line
@@ -2076,14 +2076,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;
@@ -2142,14 +2142,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;