mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-30 22:26:55 +00:00
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: Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by: Christian König <christian.koenig@amd.com> Acked-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
This commit is contained in:
parent
7d1500f9fb
commit
bed2dd8421
12 changed files with 23 additions and 77 deletions
|
@ -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)
|
int amdgpu_mmap(struct file *filp, struct vm_area_struct *vma)
|
||||||
{
|
{
|
||||||
struct drm_file *file_priv;
|
struct drm_file *file_priv = filp->private_data;
|
||||||
struct amdgpu_device *adev;
|
struct amdgpu_device *adev = file_priv->minor->dev->dev_private;
|
||||||
|
|
||||||
if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
file_priv = filp->private_data;
|
|
||||||
adev = file_priv->minor->dev->dev_private;
|
|
||||||
if (adev == NULL)
|
if (adev == NULL)
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
||||||
|
|
|
@ -343,13 +343,8 @@ int ast_bo_push_sysram(struct ast_bo *bo)
|
||||||
|
|
||||||
int ast_mmap(struct file *filp, struct vm_area_struct *vma)
|
int ast_mmap(struct file *filp, struct vm_area_struct *vma)
|
||||||
{
|
{
|
||||||
struct drm_file *file_priv;
|
struct drm_file *file_priv = filp->private_data;
|
||||||
struct ast_private *ast;
|
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);
|
return ttm_bo_mmap(filp, vma, &ast->ttm.bdev);
|
||||||
}
|
}
|
||||||
|
|
|
@ -263,14 +263,9 @@ int bochs_bo_unpin(struct bochs_bo *bo)
|
||||||
|
|
||||||
int bochs_mmap(struct file *filp, struct vm_area_struct *vma)
|
int bochs_mmap(struct file *filp, struct vm_area_struct *vma)
|
||||||
{
|
{
|
||||||
struct drm_file *file_priv;
|
struct drm_file *file_priv = filp->private_data;
|
||||||
struct bochs_device *bochs;
|
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);
|
return ttm_bo_mmap(filp, vma, &bochs->ttm.bdev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -330,13 +330,8 @@ int cirrus_bo_push_sysram(struct cirrus_bo *bo)
|
||||||
|
|
||||||
int cirrus_mmap(struct file *filp, struct vm_area_struct *vma)
|
int cirrus_mmap(struct file *filp, struct vm_area_struct *vma)
|
||||||
{
|
{
|
||||||
struct drm_file *file_priv;
|
struct drm_file *file_priv = filp->private_data;
|
||||||
struct cirrus_device *cirrus;
|
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);
|
return ttm_bo_mmap(filp, vma, &cirrus->ttm.bdev);
|
||||||
}
|
}
|
||||||
|
|
|
@ -319,14 +319,9 @@ int hibmc_bo_unpin(struct hibmc_bo *bo)
|
||||||
|
|
||||||
int hibmc_mmap(struct file *filp, struct vm_area_struct *vma)
|
int hibmc_mmap(struct file *filp, struct vm_area_struct *vma)
|
||||||
{
|
{
|
||||||
struct drm_file *file_priv;
|
struct drm_file *file_priv = filp->private_data;
|
||||||
struct hibmc_drm_private *hibmc;
|
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);
|
return ttm_bo_mmap(filp, vma, &hibmc->bdev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -344,13 +344,8 @@ int mgag200_bo_push_sysram(struct mgag200_bo *bo)
|
||||||
|
|
||||||
int mgag200_mmap(struct file *filp, struct vm_area_struct *vma)
|
int mgag200_mmap(struct file *filp, struct vm_area_struct *vma)
|
||||||
{
|
{
|
||||||
struct drm_file *file_priv;
|
struct drm_file *file_priv = filp->private_data;
|
||||||
struct mga_device *mdev;
|
struct mga_device *mdev = file_priv->minor->dev->dev_private;
|
||||||
|
|
||||||
if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
file_priv = filp->private_data;
|
|
||||||
mdev = file_priv->minor->dev->dev_private;
|
|
||||||
return ttm_bo_mmap(filp, vma, &mdev->ttm.bdev);
|
return ttm_bo_mmap(filp, vma, &mdev->ttm.bdev);
|
||||||
}
|
}
|
||||||
|
|
|
@ -168,9 +168,6 @@ nouveau_ttm_mmap(struct file *filp, struct vm_area_struct *vma)
|
||||||
struct drm_file *file_priv = filp->private_data;
|
struct drm_file *file_priv = filp->private_data;
|
||||||
struct nouveau_drm *drm = nouveau_drm(file_priv->minor->dev);
|
struct nouveau_drm *drm = nouveau_drm(file_priv->minor->dev);
|
||||||
|
|
||||||
if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))
|
|
||||||
return drm_legacy_mmap(filp, vma);
|
|
||||||
|
|
||||||
return ttm_bo_mmap(filp, vma, &drm->ttm.bdev);
|
return ttm_bo_mmap(filp, vma, &drm->ttm.bdev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -63,15 +63,10 @@ static vm_fault_t qxl_ttm_fault(struct vm_fault *vmf)
|
||||||
|
|
||||||
int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
|
int qxl_mmap(struct file *filp, struct vm_area_struct *vma)
|
||||||
{
|
{
|
||||||
struct drm_file *file_priv;
|
|
||||||
struct qxl_device *qdev;
|
|
||||||
int r;
|
int r;
|
||||||
|
struct drm_file *file_priv = filp->private_data;
|
||||||
|
struct qxl_device *qdev = file_priv->minor->dev->dev_private;
|
||||||
|
|
||||||
if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
file_priv = filp->private_data;
|
|
||||||
qdev = file_priv->minor->dev->dev_private;
|
|
||||||
if (qdev == NULL) {
|
if (qdev == NULL) {
|
||||||
DRM_ERROR(
|
DRM_ERROR(
|
||||||
"filp->private_data->minor->dev->dev_private == NULL\n");
|
"filp->private_data->minor->dev->dev_private == NULL\n");
|
||||||
|
|
|
@ -898,16 +898,10 @@ static vm_fault_t radeon_ttm_fault(struct vm_fault *vmf)
|
||||||
|
|
||||||
int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
|
int radeon_mmap(struct file *filp, struct vm_area_struct *vma)
|
||||||
{
|
{
|
||||||
struct drm_file *file_priv;
|
|
||||||
struct radeon_device *rdev;
|
|
||||||
int r;
|
int r;
|
||||||
|
struct drm_file *file_priv = filp->private_data;
|
||||||
|
struct radeon_device *rdev = file_priv->minor->dev->dev_private;
|
||||||
|
|
||||||
if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET)) {
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
file_priv = filp->private_data;
|
|
||||||
rdev = file_priv->minor->dev->dev_private;
|
|
||||||
if (rdev == NULL) {
|
if (rdev == NULL) {
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
}
|
}
|
||||||
|
|
|
@ -432,6 +432,9 @@ int ttm_bo_mmap(struct file *filp, struct vm_area_struct *vma,
|
||||||
struct ttm_buffer_object *bo;
|
struct ttm_buffer_object *bo;
|
||||||
int ret;
|
int ret;
|
||||||
|
|
||||||
|
if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
bo = ttm_bo_vm_lookup(bdev, vma->vm_pgoff, vma_pages(vma));
|
bo = ttm_bo_vm_lookup(bdev, vma->vm_pgoff, vma_pages(vma));
|
||||||
if (unlikely(!bo))
|
if (unlikely(!bo))
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
|
|
@ -30,16 +30,9 @@
|
||||||
|
|
||||||
int vmw_mmap(struct file *filp, struct vm_area_struct *vma)
|
int vmw_mmap(struct file *filp, struct vm_area_struct *vma)
|
||||||
{
|
{
|
||||||
struct drm_file *file_priv;
|
struct drm_file *file_priv = filp->private_data;
|
||||||
struct vmw_private *dev_priv;
|
struct vmw_private *dev_priv = vmw_priv(file_priv->minor->dev);
|
||||||
|
|
||||||
if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET)) {
|
|
||||||
DRM_ERROR("Illegal attempt to mmap old fifo space.\n");
|
|
||||||
return -EINVAL;
|
|
||||||
}
|
|
||||||
|
|
||||||
file_priv = filp->private_data;
|
|
||||||
dev_priv = vmw_priv(file_priv->minor->dev);
|
|
||||||
return ttm_bo_mmap(filp, vma, &dev_priv->bdev);
|
return ttm_bo_mmap(filp, vma, &dev_priv->bdev);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -357,14 +357,8 @@ int vbox_bo_push_sysram(struct vbox_bo *bo)
|
||||||
|
|
||||||
int vbox_mmap(struct file *filp, struct vm_area_struct *vma)
|
int vbox_mmap(struct file *filp, struct vm_area_struct *vma)
|
||||||
{
|
{
|
||||||
struct drm_file *file_priv;
|
struct drm_file *file_priv = filp->private_data;
|
||||||
struct vbox_private *vbox;
|
struct vbox_private *vbox = file_priv->minor->dev->dev_private;
|
||||||
|
|
||||||
if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))
|
|
||||||
return -EINVAL;
|
|
||||||
|
|
||||||
file_priv = filp->private_data;
|
|
||||||
vbox = file_priv->minor->dev->dev_private;
|
|
||||||
|
|
||||||
return ttm_bo_mmap(filp, vma, &vbox->ttm.bdev);
|
return ttm_bo_mmap(filp, vma, &vbox->ttm.bdev);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue