Commit bed2dd84 authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Alex Deucher
Browse files

drm/ttm: Quick-test mmap offset in ttm_bo_mmap() 



A BO's address has to be at least the minimum offset. Sharing this
test in ttm_bo_mmap() removes code from drivers. A full buffer-address
validation is still done within drm_vma_offset_lockup_locked().

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarChristian König <christian.koenig@amd.com>
Acked-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 7d1500f9

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

+2 −7
Original line number Diff line number Diff line
@@ -1823,14 +1823,9 @@ void amdgpu_ttm_set_buffer_funcs_status(struct amdgpu_device *adev, bool enable) 


int amdgpu_mmap(struct file *filp, struct vm_area_struct *vma)

{

	struct drm_file *file_priv;

	struct amdgpu_device *adev;



	if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))

		return -EINVAL;

	struct drm_file *file_priv = filp->private_data;

	struct amdgpu_device *adev = file_priv->minor->dev->dev_private;



	file_priv = filp->private_data;

	adev = file_priv->minor->dev->dev_private;

	if (adev == NULL)

		return -EINVAL;

drivers/gpu/drm/ast/ast_ttm.c

+2 −7
Original line number Diff line number Diff line
@@ -343,13 +343,8 @@ int ast_bo_push_sysram(struct ast_bo *bo) 


int ast_mmap(struct file *filp, struct vm_area_struct *vma)

{

	struct drm_file *file_priv;

	struct ast_private *ast;

	struct drm_file *file_priv = filp->private_data;

	struct ast_private *ast = file_priv->minor->dev->dev_private;



	if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))

		return -EINVAL;



	file_priv = filp->private_data;

	ast = file_priv->minor->dev->dev_private;

	return ttm_bo_mmap(filp, vma, &ast->ttm.bdev);

}

drivers/gpu/drm/bochs/bochs_mm.c

+2 −7
Original line number Diff line number Diff line
@@ -263,14 +263,9 @@ int bochs_bo_unpin(struct bochs_bo *bo) 


int bochs_mmap(struct file *filp, struct vm_area_struct *vma)

{

	struct drm_file *file_priv;

	struct bochs_device *bochs;

	struct drm_file *file_priv = filp->private_data;

	struct bochs_device *bochs = file_priv->minor->dev->dev_private;



	if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))

		return -EINVAL;



	file_priv = filp->private_data;

	bochs = file_priv->minor->dev->dev_private;

	return ttm_bo_mmap(filp, vma, &bochs->ttm.bdev);

}

drivers/gpu/drm/cirrus/cirrus_ttm.c

+2 −7
Original line number Diff line number Diff line
@@ -330,13 +330,8 @@ int cirrus_bo_push_sysram(struct cirrus_bo *bo) 


int cirrus_mmap(struct file *filp, struct vm_area_struct *vma)

{

	struct drm_file *file_priv;

	struct cirrus_device *cirrus;

	struct drm_file *file_priv = filp->private_data;

	struct cirrus_device *cirrus = file_priv->minor->dev->dev_private;



	if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))

		return -EINVAL;



	file_priv = filp->private_data;

	cirrus = file_priv->minor->dev->dev_private;

	return ttm_bo_mmap(filp, vma, &cirrus->ttm.bdev);

}

drivers/gpu/drm/hisilicon/hibmc/hibmc_ttm.c

+2 −7
Original line number Diff line number Diff line
@@ -319,14 +319,9 @@ int hibmc_bo_unpin(struct hibmc_bo *bo) 


int hibmc_mmap(struct file *filp, struct vm_area_struct *vma)

{

	struct drm_file *file_priv;

	struct hibmc_drm_private *hibmc;

	struct drm_file *file_priv = filp->private_data;

	struct hibmc_drm_private *hibmc = file_priv->minor->dev->dev_private;



	if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))

		return -EINVAL;



	file_priv = filp->private_data;

	hibmc = file_priv->minor->dev->dev_private;

	return ttm_bo_mmap(filp, vma, &hibmc->bdev);

}