Commit e3512fb6 authored by Xℹ Ruoyao's avatar Xℹ Ruoyao Committed by Alex Deucher
Browse files

drm/amdgpu: check alignment on CPU page for bo map 



The page table of AMDGPU requires an alignment to CPU page so we should
check ioctl parameters for it.  Return -EINVAL if some parameter is
unaligned to CPU page, instead of corrupt the page table sliently.

Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Signed-off-by: default avatarXi Ruoyao <xry111@mengyan1223.wang>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
Cc: stable@vger.kernel.org
parent 566c6e25

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

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



	/* validate the parameters */

	if (saddr & AMDGPU_GPU_PAGE_MASK || offset & AMDGPU_GPU_PAGE_MASK ||

	    size == 0 || size & AMDGPU_GPU_PAGE_MASK)

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

	    size == 0 || size & ~PAGE_MASK)

		return -EINVAL;



	/* make sure object fit at this offset */
@@ -2263,8 +2263,8 @@ int amdgpu_vm_bo_replace_map(struct amdgpu_device *adev, 
	int r;



	/* validate the parameters */

	if (saddr & AMDGPU_GPU_PAGE_MASK || offset & AMDGPU_GPU_PAGE_MASK ||

	    size == 0 || size & AMDGPU_GPU_PAGE_MASK)

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

	    size == 0 || size & ~PAGE_MASK)

		return -EINVAL;



	/* make sure object fit at this offset */